diff --git a/packages/backend-core/src/sql/utils.ts b/packages/backend-core/src/sql/utils.ts
index a8b295d879..2d9b289417 100644
--- a/packages/backend-core/src/sql/utils.ts
+++ b/packages/backend-core/src/sql/utils.ts
@@ -8,7 +8,7 @@ const ROW_ID_REGEX = /^\[.*]$/g
 const ENCODED_SPACE = encodeURIComponent(" ")
 
 export function isExternalTableID(tableId: string) {
-  return tableId.includes(DocumentType.DATASOURCE)
+  return tableId.startsWith(DocumentType.DATASOURCE + SEPARATOR)
 }
 
 export function isInternalTableID(tableId: string) {
diff --git a/scripts/devDocker.sh b/scripts/devDocker.sh
index e5981b7187..8c9d823fc3 100755
--- a/scripts/devDocker.sh
+++ b/scripts/devDocker.sh
@@ -7,6 +7,6 @@ if [ ! -d "./packages/pro/src" ]; then
 fi
 
 yarn build --scope @budibase/server --scope @budibase/worker
-DOCKER_BUILDKIT=1 docker compose -f hosting/docker-compose.build.yaml -f hosting/docker-compose.dev.yaml --env-file hosting/.env up --build --scale proxy-service=0
+docker compose -f hosting/docker-compose.build.yaml -f hosting/docker-compose.dev.yaml --env-file hosting/.env up --build --scale proxy-service=0