diff --git a/lerna.json b/lerna.json
index 489986b57f..8eb8cf46a1 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
-  "version": "3.2.17",
+  "version": "3.2.18",
   "npmClient": "yarn",
   "concurrency": 20,
   "command": {
diff --git a/packages/server/src/sdk/app/rows/utils.ts b/packages/server/src/sdk/app/rows/utils.ts
index 50170dd8bd..c19654d817 100644
--- a/packages/server/src/sdk/app/rows/utils.ts
+++ b/packages/server/src/sdk/app/rows/utils.ts
@@ -96,7 +96,7 @@ export async function enrichQueryJson(
       })
     }
   } else {
-    datasource = json.endpoint.datasourceId
+    datasource = await sdk.datasources.enrich(json.endpoint.datasourceId)
   }
 
   let tables: Record<string, Table>