diff --git a/packages/app/src/components/workspace-setting/workspace-setting.tsx b/packages/app/src/components/workspace-setting/workspace-setting.tsx
index a0e28ad240..1791c07f78 100644
--- a/packages/app/src/components/workspace-setting/workspace-setting.tsx
+++ b/packages/app/src/components/workspace-setting/workspace-setting.tsx
@@ -293,14 +293,16 @@ const MembersPage = ({ workspace }: { workspace: Workspace }) => {
 
 const PublishPage = ({ workspace }: { workspace: Workspace }) => {
   const shareUrl = window.location.host + '/workspace/' + workspace.id;
-  const [publicStatus, setPublicStatus] = useState<boolean>(workspace.public);
+  const [publicStatus, setPublicStatus] = useState<boolean | null>(
+    workspace.public
+  );
   const togglePublic = (flag: boolean) => {
     updateWorkspace({
       id: workspace.id,
       public: flag,
-    }).then(() => {
-      setPublicStatus(!publicStatus);
-      toast('Updated');
+    }).then(data => {
+      setPublicStatus(data?.public);
+      toast('Updated Public Status Success');
     });
   };
   const copyUrl = () => {
diff --git a/packages/data-services/src/sdks/workspace.ts b/packages/data-services/src/sdks/workspace.ts
index 4b2c0b9aa7..daa5d9b38a 100644
--- a/packages/data-services/src/sdks/workspace.ts
+++ b/packages/data-services/src/sdks/workspace.ts
@@ -89,7 +89,7 @@ export interface UpdateWorkspaceParams {
 
 export async function updateWorkspace(
   params: UpdateWorkspaceParams
-): Promise<void> {
+): Promise<{ public: boolean | null }> {
   return client
     .post(`/api/workspace/${params.id}`, {
       json: {