diff --git a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx
index 23de0834cd0d..6b6097e1b5b9 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.test.tsx
@@ -24,6 +24,7 @@ const storeState = {
     },
     datasources: {
       structure: {},
+      list: [],
     },
   },
   ui: {
diff --git a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
index 7d283d140f59..54d13072d079 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
@@ -21,6 +21,7 @@ import type { SourceEntity } from "entities/AppsmithConsole";
 import type { Action } from "entities/Action";
 import QueryResponseTab from "PluginActionEditor/components/PluginActionResponse/components/QueryResponseTab";
 import {
+  getDatasource,
   getDatasourceStructureById,
   getPluginDatasourceComponentFromId,
 } from "ee/selectors/entitiesSelector";
@@ -97,6 +98,10 @@ function QueryDebuggerTabs({
     ),
   );
 
+  const datasource = useSelector((state) =>
+    getDatasource(state, currentActionConfig?.datasource?.id ?? ""),
+  );
+
   useEffect(() => {
     if (
       currentActionConfig?.datasource?.id &&
@@ -252,7 +257,7 @@ function QueryDebuggerTabs({
         <Schema
           currentActionId={currentActionConfig.id}
           datasourceId={currentActionConfig.datasource.id || ""}
-          datasourceName={currentActionConfig.datasource.name || ""}
+          datasourceName={datasource?.name || ""}
         />
       ),
     });