diff --git a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
index 532c6cf8d0..ea82cda35a 100644
--- a/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/QueryDebuggerTabs.tsx
@@ -98,18 +98,21 @@ function QueryDebuggerTabs({
   );
 
   const datasourceStructure = useSelector((state) =>
-    getDatasourceStructureById(state, currentActionConfig?.datasource.id || ""),
+    getDatasourceStructureById(
+      state,
+      currentActionConfig?.datasource?.id ?? "",
+    ),
   );
 
   useEffect(() => {
     if (
-      currentActionConfig?.datasource.id &&
+      currentActionConfig?.datasource?.id &&
       datasourceStructure === undefined &&
       pluginDatasourceForm !== DatasourceComponentTypes.RestAPIDatasourceForm
     ) {
       dispatch(
         fetchDatasourceStructure(
-          currentActionConfig?.datasource.id,
+          currentActionConfig.datasource.id,
           true,
           DatasourceStructureContext.QUERY_EDITOR,
         ),
@@ -180,7 +183,7 @@ function QueryDebuggerTabs({
     });
   }
 
-  if (showSchema && currentActionConfig) {
+  if (showSchema && currentActionConfig && currentActionConfig.datasource) {
     responseTabs.unshift({
       key: "schema",
       title: "Schema",