diff --git a/src/plugins/workspace/server/plugin.ts b/src/plugins/workspace/server/plugin.ts
index efc97c2bff1..0056e9ac784 100644
--- a/src/plugins/workspace/server/plugin.ts
+++ b/src/plugins/workspace/server/plugin.ts
@@ -93,7 +93,7 @@ export class WorkspacePlugin implements Plugin<WorkspacePluginSetup, WorkspacePl
     core.savedObjects.addClientWrapper(
       PRIORITY_FOR_WORKSPACE_ID_CONSUMER_WRAPPER,
       WORKSPACE_ID_CONSUMER_WRAPPER_ID,
-      new WorkspaceIdConsumerWrapper().wrapperFactory
+      new WorkspaceIdConsumerWrapper(isPermissionControlEnabled).wrapperFactory
     );
 
     const maxImportExportSize = core.savedObjects.getImportExportObjectLimit();
diff --git a/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.test.ts b/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.test.ts
index caec663a3f5..a9b83fb8a49 100644
--- a/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.test.ts
+++ b/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.test.ts
@@ -118,6 +118,24 @@ describe('WorkspaceIdConsumerWrapper', () => {
 
     it(`Should set workspacesSearchOperator when search with public workspace`, async () => {
       await wrapperClient.find({
+        type: 'dashboard',
+        workspaces: [PUBLIC_WORKSPACE_ID],
+      });
+      expect(mockedClient.find).toBeCalledWith({
+        type: 'dashboard',
+        workspaces: [PUBLIC_WORKSPACE_ID],
+        workspacesSearchOperator: 'OR',
+      });
+    });
+
+    it(`Should remove public workspace when permission control is enabled`, async () => {
+      const consumer = new WorkspaceIdConsumerWrapper(true);
+      const client = consumer.wrapperFactory({
+        client: mockedClient,
+        typeRegistry: requestHandlerContext.savedObjects.typeRegistry,
+        request: workspaceEnabledMockRequest,
+      });
+      await client.find({
         type: 'dashboard',
         workspaces: ['bar', PUBLIC_WORKSPACE_ID],
       });
diff --git a/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts b/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts
index b6fe022744e..1df746f3f22 100644
--- a/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts
+++ b/src/plugins/workspace/server/saved_objects/workspace_id_consumer_wrapper.ts
@@ -66,13 +66,18 @@ export class WorkspaceIdConsumerWrapper {
       delete: wrapperOptions.client.delete,
       find: (options: SavedObjectsFindOptions) => {
         const findOptions = this.formatWorkspaceIdParams(wrapperOptions.request, options);
+
         // `PUBLIC_WORKSPACE_ID` includes both saved objects without any workspace and with `PUBLIC_WORKSPACE_ID` workspace
-        const index = findOptions.workspaces?.indexOf(PUBLIC_WORKSPACE_ID) || -1;
+        const index = findOptions.workspaces
+          ? findOptions.workspaces.indexOf(PUBLIC_WORKSPACE_ID)
+          : -1;
         if (!findOptions.workspacesSearchOperator && findOptions.workspaces && index !== -1) {
           findOptions.workspacesSearchOperator = 'OR';
-          // remove public workspace to make sure we can pass permission control validation, more details in `WorkspaceSavedObjectsClientWrapper`
           // remove this deletion logic when public workspace becomes to real
-          findOptions.workspaces.splice(index, 1);
+          if (this.isPermissionControlEnabled) {
+            // remove public workspace to make sure we can pass permission control validation, more details in `WorkspaceSavedObjectsClientWrapper`
+            findOptions.workspaces.splice(index, 1);
+          }
         }
         return wrapperOptions.client.find(findOptions);
       },
@@ -86,5 +91,5 @@ export class WorkspaceIdConsumerWrapper {
     };
   };
 
-  constructor() {}
+  constructor(private isPermissionControlEnabled?: boolean) {}
 }