diff --git a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
index ec57d526e6..74f0046053 100644
--- a/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
+++ b/packages/builder/src/components/backend/DatasourceNavigator/DatasourceNavigator.svelte
@@ -30,7 +30,7 @@
     $datasources,
     $params,
     $isActive,
-    $tables,
+    $tables.selected?._id,
     $queries,
     $views,
     $viewsV2,