diff --git a/lerna.json b/lerna.json
index 5c20645fec..0e0b1ed8b0 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.8.2-alpha.5",
+  "version": "2.8.2",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
@@ -19,4 +19,4 @@
       "loadEnvFiles": false
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
index 3cb3ef96a6..6235ea397a 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)