diff --git a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
index be20da7cd6..6fd2750f82 100644
--- a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
+++ b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
@@ -10,9 +10,8 @@ export const createTableSelectionStore = (integration, datasource) => {
 
   datasources.getTableNames(datasource).then(tableNames => {
     tableNamesStore.set(tableNames)
-
     selectedTableNamesStore.set(
-      tableNames.filter(tableName => datasource.entities[tableName])
+      tableNames.filter(tableName => datasource.entities?.[tableName])
     )
 
     loadingStore.set(false)