diff --git a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
index 46238e333c..826d7d84ba 100644
--- a/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
+++ b/packages/builder/src/components/backend/Datasources/TableImportSelection/tableSelectionStore.js
@@ -10,7 +10,11 @@ export const createTableSelectionStore = (integration, datasource) => {
 
   datasources.getTableNames(datasource).then(tableNames => {
     tableNamesStore.set(tableNames)
-    selectedTableNamesStore.set(tableNames.filter(t => datasource.entities[t]))
+
+    selectedTableNamesStore.set(
+      tableNames.filter(tableName => datasource.entities[tableName])
+    )
+
     loadingStore.set(false)
   })
 
diff --git a/packages/builder/src/stores/backend/datasources.js b/packages/builder/src/stores/backend/datasources.js
index b1db99b5d8..7d2db44d6a 100644
--- a/packages/builder/src/stores/backend/datasources.js
+++ b/packages/builder/src/stores/backend/datasources.js
@@ -144,8 +144,7 @@ export function createDatasourcesStore() {
 
     const response = await API.createDatasource({
       datasource,
-      fetchSchema:
-        integration.plus && integration.name !== IntegrationTypes.GOOGLE_SHEETS,
+      fetchSchema: integration.plus,
     })
 
     return updateDatasource(response)