diff --git a/packages/app/src/components/workspace-setting/MembersPage.tsx b/packages/app/src/components/workspace-setting/MembersPage.tsx
index 3859bcbd2..08b2640c9 100644
--- a/packages/app/src/components/workspace-setting/MembersPage.tsx
+++ b/packages/app/src/components/workspace-setting/MembersPage.tsx
@@ -64,7 +64,7 @@ export const MembersPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
 
   return (
     <div>
-      {workspace.provider === 'cloud' ? (
+      {workspace.provider === 'affine' ? (
         <>
           <StyledMemberTitleContainer>
             <StyledMemberNameContainer>
diff --git a/packages/app/src/components/workspace-setting/PublishPage.tsx b/packages/app/src/components/workspace-setting/PublishPage.tsx
index dce254dc2..c5c39cc2d 100644
--- a/packages/app/src/components/workspace-setting/PublishPage.tsx
+++ b/packages/app/src/components/workspace-setting/PublishPage.tsx
@@ -9,20 +9,17 @@ import {
 import { Button } from '@/ui/button';
 import Input from '@/ui/input';
 import { toast } from '@/ui/toast';
-import { useConfirm } from '@/providers/ConfirmProvider';
 // import { useAppState } from '@/providers/app-state-provider3';
-import { useWorkspaceHelper } from '@/hooks/use-workspace-helper';
 import { WorkspaceUnit } from '@affine/datacenter';
+import { useWorkspaceHelper } from '@/hooks/use-workspace-helper';
 
 export const PublishPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
   const shareUrl =
     window.location.host + '/workspace/' + workspace.id + '?share=true';
-  const { publishWorkspace } = useWorkspaceHelper();
+  const { publishWorkspace, enableWorkspace } = useWorkspaceHelper();
 
-  const { confirm } = useConfirm();
-
-  const togglePublic = (flag: boolean) => {
-    workspace.id && publishWorkspace(workspace?.id, flag);
+  const togglePublic = async (flag: boolean) => {
+    await publishWorkspace(workspace.id.toString(), flag);
   };
 
   const copyUrl = () => {
@@ -30,27 +27,12 @@ export const PublishPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
     toast('Copied url to clipboard');
   };
 
-  const enableAffineCloud = () => {
-    confirm({
-      title: 'Enable AFFiNE Cloud?',
-      content: `If enabled, the data in this workspace will be backed up and synchronized via AFFiNE Cloud.`,
-      confirmText:
-        workspace.provider === 'local' ? 'Enable' : 'Sign in and Enable',
-      cancelText: 'Skip',
-    }).then(confirm => {
-      if (confirm) {
-        // if (user) {
-        //   updateWorkspaceMeta(workspace.id, { type: 'cloud' });
-        // } else {
-        //   login();
-        //   updateWorkspaceMeta(workspace.id, { type: 'cloud' });
-        // }
-      }
-    });
+  const enableAffineCloud = async () => {
+    await enableWorkspace();
   };
   return (
     <>
-      {workspace.provider === 'cloud' ? (
+      {workspace.provider === 'affine' ? (
         <div>
           <StyledPublishContent>
             {workspace?.published ? (
diff --git a/packages/app/src/components/workspace-setting/SyncPage.tsx b/packages/app/src/components/workspace-setting/SyncPage.tsx
index 37ba8ab3f..d6345a294 100644
--- a/packages/app/src/components/workspace-setting/SyncPage.tsx
+++ b/packages/app/src/components/workspace-setting/SyncPage.tsx
@@ -8,16 +8,8 @@ import { Button } from '@/ui/button';
 import { Menu, MenuItem } from '@/ui/menu';
 import { WorkspaceUnit } from '@affine/datacenter';
 import { useWorkspaceHelper } from '@/hooks/use-workspace-helper';
-import { useAppState } from '@/providers/app-state-provider';
-import { useConfirm } from '@/providers/ConfirmProvider';
-import { toast } from '@/ui/toast';
-import { useRouter } from 'next/router';
 export const SyncPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
-  // console.log('workspace: ', workspace);
   const { enableWorkspace } = useWorkspaceHelper();
-  const { currentWorkspace, user } = useAppState();
-  const { confirm } = useConfirm();
-  const router = useRouter();
   return (
     <div>
       <StyledPublishContent>
@@ -31,22 +23,8 @@ export const SyncPage = ({ workspace }: { workspace: WorkspaceUnit }) => {
 
             <StyledPublishCopyContainer>
               <Button
-                onClick={() => {
-                  confirm({
-                    title: 'Enable AFFiNE Cloud?',
-                    content: `If enabled, the data in this workspace will be backed up and synchronized via AFFiNE Cloud.`,
-                    confirmText: user ? 'Enable' : 'Sign in and Enable',
-                    cancelText: 'Skip',
-                  }).then(async confirm => {
-                    if (confirm && currentWorkspace) {
-                      // if (user) {
-                      //   await login();
-                      // }
-                      const id = await enableWorkspace(currentWorkspace);
-                      router.push(`/workspace/${id}/setting`);
-                      toast('Enabled success');
-                    }
-                  });
+                onClick={async () => {
+                  await enableWorkspace();
                 }}
                 type="primary"
                 shape="circle"
diff --git a/packages/app/src/hooks/use-workspace-helper.ts b/packages/app/src/hooks/use-workspace-helper.ts
index 4d6493a25..af5fb5ad7 100644
--- a/packages/app/src/hooks/use-workspace-helper.ts
+++ b/packages/app/src/hooks/use-workspace-helper.ts
@@ -1,7 +1,12 @@
 import { useAppState } from '@/providers/app-state-provider';
+import { useConfirm } from '@/providers/ConfirmProvider';
+import { toast } from '@/ui/toast';
 import { Workspace } from '@blocksuite/store';
+import router from 'next/router';
+
 export const useWorkspaceHelper = () => {
-  const { dataCenter } = useAppState();
+  const { confirm } = useConfirm();
+  const { dataCenter, currentWorkspace, user, login } = useAppState();
   const createWorkspace = async (name: string) => {
     const workspaceInfo = await dataCenter.createWorkspace({
       name: name,
@@ -16,7 +21,7 @@ export const useWorkspaceHelper = () => {
   // const updateWorkspace = async (workspace: Workspace) => {};
 
   const publishWorkspace = async (workspaceId: string, publish: boolean) => {
-    dataCenter.setWorkspacePublish(workspaceId, publish);
+    await dataCenter.setWorkspacePublish(workspaceId, publish);
   };
 
   const updateWorkspace = async (
@@ -32,11 +37,26 @@ export const useWorkspaceHelper = () => {
     }
   };
 
-  const enableWorkspace = async (workspace: Workspace) => {
-    const newWorkspaceId = await dataCenter.enableWorkspaceCloud(workspace);
-    // console.log('newWorkspace: ', newWorkspace);
-    return newWorkspaceId;
+  const enableWorkspace = async () => {
+    confirm({
+      title: 'Enable AFFiNE Cloud?',
+      content: `If enabled, the data in this workspace will be backed up and synchronized via AFFiNE Cloud.`,
+      confirmText: user ? 'Enable' : 'Sign in and Enable',
+      cancelText: 'Skip',
+    }).then(async confirm => {
+      if (confirm && currentWorkspace) {
+        if (user) {
+          await login();
+        }
+        const newWorkspaceId = await dataCenter.enableWorkspaceCloud(
+          currentWorkspace
+        );
+        router.push(`/workspace/${newWorkspaceId}/setting`);
+        toast('Enabled success');
+      }
+    });
   };
+
   return {
     createWorkspace,
     publishWorkspace,
diff --git a/packages/app/src/providers/app-state-provider/Provider.tsx b/packages/app/src/providers/app-state-provider/Provider.tsx
index 619b7fc2c..95e545e45 100644
--- a/packages/app/src/providers/app-state-provider/Provider.tsx
+++ b/packages/app/src/providers/app-state-provider/Provider.tsx
@@ -103,7 +103,7 @@ export const AppStateProvider = ({
     const workspace = await dataCenter.loadWorkspace(workspaceId);
     const currentMetaWorkSpace = dataCenter.workspaces.find(
       (item: WorkspaceUnit) => {
-        return item.id === workspace.room;
+        return item.id.toString() === workspace.room;
       }
     );
 
diff --git a/packages/data-center/src/provider/affine/affine.ts b/packages/data-center/src/provider/affine/affine.ts
index 1ba3524fe..2b1c73ae5 100644
--- a/packages/data-center/src/provider/affine/affine.ts
+++ b/packages/data-center/src/provider/affine/affine.ts
@@ -125,6 +125,7 @@ export class AffineProvider extends BaseProvider {
     const workspaces: WorkspaceMeta0[] = workspacesList.map(w => {
       return {
         ...w,
+        published: w.public,
         memberCount: 0,
         name: '',
         provider: 'affine',