diff --git a/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js b/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js
index 5e96052f6f..eaae513bb7 100644
--- a/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js
+++ b/frontend/src/AppBuilder/_stores/slices/queryPanelSlice.js
@@ -441,7 +441,10 @@ export const createQueryPanelSlice = (set, get) => ({
                 isLoading: false,
                 data: finalData,
                 rawData,
-                metadata: data.metadata,
+                metadata: data?.metadata,
+                request: data?.request,
+                response: data?.response,
+                responseHeaders: data?.responseHeaders,
               });
 
               resolve({ status: 'ok', data: finalData });
diff --git a/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js b/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js
index 063fa026b0..dc6eb9cecc 100644
--- a/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js
+++ b/frontend/src/AppBuilder/_stores/slices/resolvedSlice.js
@@ -183,7 +183,7 @@ export const createResolvedSlice = (set, get) => ({
     );
 
     Object.entries(details).forEach(([key, value]) => {
-      if (['isLoading', 'data', 'rawData', 'request', 'response', 'responseHeaders'].includes(key)) {
+      if (['isLoading', 'data', 'rawData', 'request', 'response', 'responseHeaders', 'metadata'].includes(key)) {
         if (typeof value !== 'function') get().updateDependencyValues(`queries.${queryId}.${key}`);
       }
     });