diff --git a/packages/backend/src/apps/pipedrive/dynamic-data/list-activity-types/index.ts b/packages/backend/src/apps/pipedrive/dynamic-data/list-activity-types/index.ts
index c6f8dc3a..7867a609 100644
--- a/packages/backend/src/apps/pipedrive/dynamic-data/list-activity-types/index.ts
+++ b/packages/backend/src/apps/pipedrive/dynamic-data/list-activity-types/index.ts
@@ -15,11 +15,7 @@ export default {
       `${$.auth.data.apiDomain}/api/v1/activityTypes`
     );
 
-    if (!data?.data) {
-      return { data: [] };
-    }
-
-    if (data.data.length) {
+    if (data.data?.length) {
       for (const activityType of data.data) {
         activityTypes.data.push({
           value: activityType.key_string,
diff --git a/packages/backend/src/apps/pipedrive/dynamic-data/list-currencies/index.ts b/packages/backend/src/apps/pipedrive/dynamic-data/list-currencies/index.ts
index f18b9c39..c3d12592 100644
--- a/packages/backend/src/apps/pipedrive/dynamic-data/list-currencies/index.ts
+++ b/packages/backend/src/apps/pipedrive/dynamic-data/list-currencies/index.ts
@@ -15,7 +15,7 @@ export default {
       `${$.auth.data.apiDomain}/api/v1/currencies`
     );
 
-    if (data.data.length) {
+    if (data.data?.length) {
       for (const currency of data.data) {
         currencies.data.push({
           value: currency.code,
diff --git a/packages/backend/src/apps/pipedrive/dynamic-data/list-deals/index.ts b/packages/backend/src/apps/pipedrive/dynamic-data/list-deals/index.ts
index d93655fe..2ac3e4c8 100644
--- a/packages/backend/src/apps/pipedrive/dynamic-data/list-deals/index.ts
+++ b/packages/backend/src/apps/pipedrive/dynamic-data/list-deals/index.ts
@@ -19,11 +19,7 @@ export default {
       params,
     });
 
-    if (!data?.data) {
-      return { data: [] };
-    }
-
-    if (data.data.length) {
+    if (data.data?.length) {
       for (const deal of data.data) {
         deals.data.push({
           value: deal.id,
diff --git a/packages/backend/src/apps/pipedrive/dynamic-data/list-lead-labels/index.ts b/packages/backend/src/apps/pipedrive/dynamic-data/list-lead-labels/index.ts
index 1b98e1ec..cc22454a 100644
--- a/packages/backend/src/apps/pipedrive/dynamic-data/list-lead-labels/index.ts
+++ b/packages/backend/src/apps/pipedrive/dynamic-data/list-lead-labels/index.ts
@@ -15,11 +15,7 @@ export default {
       `${$.auth.data.apiDomain}/api/v1/leadLabels`
     );
 
-    if (!data?.data) {
-      return { data: [] };
-    }
-
-    if (data.data.length) {
+    if (data.data?.length) {
       for (const leadLabel of data.data) {
         const name = `${leadLabel.name} (${leadLabel.color})`;
         leadLabels.data.push({
diff --git a/packages/backend/src/apps/pipedrive/dynamic-data/list-leads/index.ts b/packages/backend/src/apps/pipedrive/dynamic-data/list-leads/index.ts
index e1896b16..f493b843 100644
--- a/packages/backend/src/apps/pipedrive/dynamic-data/list-leads/index.ts
+++ b/packages/backend/src/apps/pipedrive/dynamic-data/list-leads/index.ts
@@ -19,11 +19,7 @@ export default {
       params,
     });
 
-    if (!data?.data) {
-      return { data: [] };
-    }
-
-    if (data.data.length) {
+    if (data.data?.length) {
       for (const lead of data.data) {
         leads.data.push({
           value: lead.id,
diff --git a/packages/backend/src/apps/pipedrive/dynamic-data/list-organizations/index.ts b/packages/backend/src/apps/pipedrive/dynamic-data/list-organizations/index.ts
index 789b998f..b24f176e 100644
--- a/packages/backend/src/apps/pipedrive/dynamic-data/list-organizations/index.ts
+++ b/packages/backend/src/apps/pipedrive/dynamic-data/list-organizations/index.ts
@@ -15,11 +15,7 @@ export default {
       `${$.auth.data.apiDomain}/api/v1/organizations`
     );
 
-    if (!data?.data) {
-      return { data: [] };
-    }
-
-    if (data.data.length) {
+    if (data.data?.length) {
       for (const organization of data.data) {
         organizations.data.push({
           value: organization.id,
diff --git a/packages/backend/src/apps/pipedrive/dynamic-data/list-persons/index.ts b/packages/backend/src/apps/pipedrive/dynamic-data/list-persons/index.ts
index a1d08da9..a790aa6d 100644
--- a/packages/backend/src/apps/pipedrive/dynamic-data/list-persons/index.ts
+++ b/packages/backend/src/apps/pipedrive/dynamic-data/list-persons/index.ts
@@ -23,7 +23,7 @@ export default {
       );
       params.start = data.additional_data?.pagination?.next_start;
 
-      if (data.data.length) {
+      if (data.data?.length) {
         for (const person of data.data) {
           persons.data.push({
             value: person.id,
diff --git a/packages/backend/src/apps/pipedrive/dynamic-data/list-users/index.ts b/packages/backend/src/apps/pipedrive/dynamic-data/list-users/index.ts
index 1b39d650..d35c7cd1 100644
--- a/packages/backend/src/apps/pipedrive/dynamic-data/list-users/index.ts
+++ b/packages/backend/src/apps/pipedrive/dynamic-data/list-users/index.ts
@@ -13,7 +13,7 @@ export default {
 
     const { data } = await $.http.get(`${$.auth.data.apiDomain}/api/v1/users`);
 
-    if (data.data.length) {
+    if (data.data?.length) {
       for (const user of data.data) {
         users.data.push({
           value: user.id,