diff --git a/packages/frontend/core/src/components/workspace-selector/workspace-card/index.tsx b/packages/frontend/core/src/components/workspace-selector/workspace-card/index.tsx
index 9fdd97715d..e58bcaf63a 100644
--- a/packages/frontend/core/src/components/workspace-selector/workspace-card/index.tsx
+++ b/packages/frontend/core/src/components/workspace-selector/workspace-card/index.tsx
@@ -1,11 +1,12 @@
-import { Button, Skeleton, Tooltip } from '@affine/component';
+import { Button, notify, Skeleton, Tooltip } from '@affine/component';
 import { Loading } from '@affine/component/ui/loading';
 import { useSystemOnline } from '@affine/core/components/hooks/use-system-online';
 import { useWorkspace } from '@affine/core/components/hooks/use-workspace';
 import { useWorkspaceInfo } from '@affine/core/components/hooks/use-workspace-info';
-import type {
-  WorkspaceMetadata,
-  WorkspaceProfileInfo,
+import {
+  type WorkspaceMetadata,
+  type WorkspaceProfileInfo,
+  WorkspacesService,
 } from '@affine/core/modules/workspace';
 import { UNTITLED_WORKSPACE_NAME } from '@affine/env/constant';
 import { useI18n } from '@affine/i18n';
@@ -21,13 +22,15 @@ import {
   TeamWorkspaceIcon,
   UnsyncIcon,
 } from '@blocksuite/icons/rc';
-import { LiveData, useLiveData } from '@toeverything/infra';
+import { LiveData, useLiveData, useService } from '@toeverything/infra';
 import { cssVar } from '@toeverything/theme';
 import clsx from 'clsx';
 import type { HTMLAttributes } from 'react';
 import { forwardRef, useCallback, useEffect, useMemo, useState } from 'react';
 
+import { useAsyncCallback } from '../../hooks/affine-async-hooks';
 import { useCatchEventCallback } from '../../hooks/use-catch-event-hook';
+import { useNavigateHelper } from '../../hooks/use-navigate-helper';
 import { WorkspaceAvatar } from '../../workspace-avatar';
 import * as styles from './styles.css';
 export { PureWorkspaceCard } from './pure-workspace-card';
@@ -284,6 +287,8 @@ export const WorkspaceCard = forwardRef<
   ) => {
     const t = useI18n();
     const information = useWorkspaceInfo(workspaceMetadata);
+    const workspacesService = useService(WorkspacesService);
+    const navigate = useNavigateHelper();
 
     const name = information?.name ?? UNTITLED_WORKSPACE_NAME;
 
@@ -291,10 +296,24 @@ export const WorkspaceCard = forwardRef<
       onClickEnableCloud?.(workspaceMetadata);
     }, [onClickEnableCloud, workspaceMetadata]);
 
+    const onRemoveWorkspace = useAsyncCallback(async () => {
+      await workspacesService
+        .deleteWorkspace(workspaceMetadata)
+        .then(() => {
+          notify.success({ title: t['Successfully removed workspace']() });
+          navigate.jumpToIndex();
+        })
+        .catch(() => {
+          notify.error({ title: t['Failed to remove workspace']() });
+        });
+    }, [workspacesService, workspaceMetadata, t, navigate]);
+
     const onOpenSettings = useCatchEventCallback(() => {
       onClickOpenSettings?.(workspaceMetadata);
     }, [onClickOpenSettings, workspaceMetadata]);
 
+    console.log(information);
+
     return (
       <div
         className={clsx(
@@ -337,6 +356,9 @@ export const WorkspaceCard = forwardRef<
               <Skeleton width={100} />
             )}
           </div>
+          {information?.isEmpty && information.isOwner ? (
+            <Button onClick={onRemoveWorkspace}>Remove</Button>
+          ) : null}
           <div className={styles.showOnCardHover}>
             {onClickEnableCloud && workspaceMetadata.flavour === 'local' ? (
               <Button
diff --git a/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts b/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts
index 4e55683d5b..b288bf6252 100644
--- a/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts
+++ b/packages/frontend/core/src/modules/workspace-engine/impls/cloud.ts
@@ -335,6 +335,10 @@ class CloudWorkspaceFlavourProvider implements WorkspaceFlavourProvider {
     const localData = (await docStorage.getDoc(id))?.bin;
     const cloudData = (await cloudStorage.getDoc(id))?.bin;
 
+    const isEmpty = isEmptyUpdate(localData) && isEmptyUpdate(cloudData);
+
+    console.log('isEmpty', isEmpty, localData, cloudData);
+
     docStorage.connection.disconnect();
 
     const info = await this.getWorkspaceInfo(id, signal);
@@ -344,6 +348,7 @@ class CloudWorkspaceFlavourProvider implements WorkspaceFlavourProvider {
         isOwner: info.workspace.role === Permission.Owner,
         isAdmin: info.workspace.role === Permission.Admin,
         isTeam: info.workspace.team,
+        isEmpty,
       };
     }
 
@@ -360,8 +365,10 @@ class CloudWorkspaceFlavourProvider implements WorkspaceFlavourProvider {
       isOwner: info.workspace.role === Permission.Owner,
       isAdmin: info.workspace.role === Permission.Admin,
       isTeam: info.workspace.team,
+      isEmpty,
     };
   }
+
   async getWorkspaceBlob(id: string, blob: string): Promise<Blob | null> {
     const storage = new this.BlobStorageType({
       id: id,
@@ -659,3 +666,13 @@ export class CloudWorkspaceFlavoursProvider
     }
   );
 }
+
+export function isEmptyUpdate(binary: Uint8Array | undefined) {
+  if (!binary) {
+    return true;
+  }
+  return (
+    binary.byteLength === 0 ||
+    (binary.byteLength === 2 && binary[0] === 0 && binary[1] === 0)
+  );
+}
diff --git a/packages/frontend/core/src/modules/workspace/entities/profile.ts b/packages/frontend/core/src/modules/workspace/entities/profile.ts
index 50922e7f7d..ecf6099278 100644
--- a/packages/frontend/core/src/modules/workspace/entities/profile.ts
+++ b/packages/frontend/core/src/modules/workspace/entities/profile.ts
@@ -24,6 +24,7 @@ export interface WorkspaceProfileInfo {
   isOwner?: boolean;
   isAdmin?: boolean;
   isTeam?: boolean;
+  isEmpty?: boolean;
 }
 
 /**
@@ -61,6 +62,7 @@ export class WorkspaceProfile extends Entity<{ metadata: WorkspaceMetadata }> {
   }
 
   private setProfile(info: WorkspaceProfileInfo) {
+    console.log('setProfile', info, isEqual(this.profile$.value, info));
     if (isEqual(this.profile$.value, info)) {
       return;
     }
diff --git a/packages/frontend/core/src/modules/workspace/stores/profile-cache.ts b/packages/frontend/core/src/modules/workspace/stores/profile-cache.ts
index b6bf8d736a..4b583c4cbe 100644
--- a/packages/frontend/core/src/modules/workspace/stores/profile-cache.ts
+++ b/packages/frontend/core/src/modules/workspace/stores/profile-cache.ts
@@ -19,13 +19,7 @@ export class WorkspaceProfileCacheStore extends Store {
         }
 
         const info = data as WorkspaceProfileInfo;
-        return {
-          avatar: info.avatar,
-          name: info.name,
-          isOwner: info.isOwner,
-          isAdmin: info.isAdmin,
-          isTeam: info.isTeam,
-        };
+        return info;
       })
     );
   }