diff --git a/client/packages/lowcoder/src/pages/editor/AppEditor.tsx b/client/packages/lowcoder/src/pages/editor/AppEditor.tsx
index 0928438920..9bdf356755 100644
--- a/client/packages/lowcoder/src/pages/editor/AppEditor.tsx
+++ b/client/packages/lowcoder/src/pages/editor/AppEditor.tsx
@@ -92,7 +92,7 @@ const AppEditor = React.memo(() => {
 
   // Set global settings with cleanup
   useEffect(() => {
-    setGlobalSettings({ applicationId: selectors.applicationId, isViewMode: selectors.paramViewMode === "view" });
+    setGlobalSettings({ applicationId: selectors.applicationId, isViewMode: selectors.paramViewMode === "view" || selectors.paramViewMode === "view_marketplace" });
     return () => {
       clearGlobalSettings();
     };
diff --git a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java
index 3e15e9aa9a..3e2a7c2aea 100644
--- a/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java
+++ b/server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java
@@ -128,11 +128,20 @@ public boolean agencyProfile() {
     }
 
     public Mono<ApplicationQuery> getQueryByViewModeAndQueryId(boolean isViewMode, String queryId, ApplicationRecordService applicationRecordService) {
-        return getLiveQueries(applicationRecordService).map(liveQueries -> (isViewMode ? liveQueries : getEditingQueries())
-                .stream()
-                .filter(query -> queryId.equals(query.getId()) || queryId.equals(query.getGid()))
-                .findFirst()
-                .orElseThrow(() -> new BizException(BizError.QUERY_NOT_FOUND, "LIBRARY_QUERY_NOT_FOUND")));
+	return isViewMode ?
+		// Get Published Queries in View/View Marketplace Mode
+		getLiveQueries(applicationRecordService).map(liveQueries -> (liveQueries)
+		.stream()
+		.filter(query -> queryId.equals(query.getId()) || queryId.equals(query.getGid()))
+		.findFirst()
+		.orElseThrow(() -> new BizException(BizError.QUERY_NOT_FOUND, "LIBRARY_QUERY_NOT_FOUND")))
+		:
+		// Get Editing Queries in Edit/Preview Mode
+		Mono.just(getEditingQueries()
+		.stream()
+		.filter(query -> queryId.equals(query.getId()) || queryId.equals(query.getGid()))
+		.findFirst()
+		.orElseThrow(() -> new BizException(BizError.QUERY_NOT_FOUND, "LIBRARY_QUERY_NOT_FOUND")));
     }
 
     /**