diff --git a/.changeset/weak-meals-care.md b/.changeset/weak-meals-care.md
new file mode 100644
index 0000000000..31cbeb6a2d
--- /dev/null
+++ b/.changeset/weak-meals-care.md
@@ -0,0 +1,5 @@
+---
+'@finos/legend-extension-dsl-data-space-studio': patch
+---
+
+fix a regression where failing to query data product in Studio
diff --git a/packages/legend-extension-dsl-data-space-studio/src/components/DataSpaceQueryAction.tsx b/packages/legend-extension-dsl-data-space-studio/src/components/DataSpaceQueryAction.tsx
index 523759e2e9..aa21f4307f 100644
--- a/packages/legend-extension-dsl-data-space-studio/src/components/DataSpaceQueryAction.tsx
+++ b/packages/legend-extension-dsl-data-space-studio/src/components/DataSpaceQueryAction.tsx
@@ -21,8 +21,11 @@ import {
   useEditorStore,
 } from '@finos/legend-application-studio';
 import { flowResult } from 'mobx';
-import { guaranteeType } from '@finos/legend-shared';
-import { DataSpace } from '@finos/legend-extension-dsl-data-space/graph';
+import { getNullableFirstEntry, guaranteeType } from '@finos/legend-shared';
+import {
+  DataSpace,
+  resolveUsableDataSpaceClasses,
+} from '@finos/legend-extension-dsl-data-space/graph';
 import {
   DataSpaceQueryBuilderState,
   type DataSpaceInfo,
@@ -31,6 +34,7 @@ import {
   QueryBuilderActionConfig,
   QueryBuilderAdvancedWorkflowState,
 } from '@finos/legend-query-builder';
+import { RuntimePointer } from '@finos/legend-graph';
 
 export const queryDataSpace = async (
   dataSpace: DataSpace,
@@ -78,7 +82,35 @@ export const queryDataSpace = async (
         queryBuilderState.setExecutionContext(
           dataSpace.defaultExecutionContext,
         );
-        await queryBuilderState.propagateExecutionContextChange();
+        const mapping = queryBuilderState.executionContext.mapping.value;
+        queryBuilderState.changeMapping(mapping);
+        const mappingModelCoverageAnalysisResult =
+          queryBuilderState.dataSpaceAnalysisResult?.mappingToMappingCoverageResult?.get(
+            mapping.path,
+          );
+        if (mappingModelCoverageAnalysisResult) {
+          queryBuilderState.explorerState.mappingModelCoverageAnalysisResult =
+            mappingModelCoverageAnalysisResult;
+        }
+        queryBuilderState.changeRuntime(
+          new RuntimePointer(queryBuilderState.executionContext.defaultRuntime),
+        );
+        const compatibleClasses = resolveUsableDataSpaceClasses(
+          queryBuilderState.dataSpace,
+          mapping,
+          queryBuilderState.graphManagerState,
+        );
+        // if there is no chosen class or the chosen one is not compatible
+        // with the mapping then pick a compatible class if possible
+        if (
+          !queryBuilderState.class ||
+          !compatibleClasses.includes(queryBuilderState.class)
+        ) {
+          const possibleNewClass = getNullableFirstEntry(compatibleClasses);
+          if (possibleNewClass) {
+            queryBuilderState.changeClass(possibleNewClass);
+          }
+        }
         return queryBuilderState;
       },
       actionConfigs: [],