diff --git a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/components/AddToFavoritesSingleRecordCommand.tsx b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/components/AddToFavoritesSingleRecordCommand.tsx
index 3ab7a2ea8c..6b63ed4b21 100644
--- a/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/components/AddToFavoritesSingleRecordCommand.tsx
+++ b/packages/twenty-front/src/modules/command-menu-item/engine-command/record/single-record/components/AddToFavoritesSingleRecordCommand.tsx
@@ -18,7 +18,7 @@ export const AddToFavoritesSingleRecordCommand = () => {
   }
 
   const { createManyNavigationMenuItems } = useCreateManyNavigationMenuItems();
-  const { navigationMenuItems, currentWorkspaceMemberId } =
+  const { navigationMenuItems, currentUserWorkspaceId } =
     useNavigationMenuItemsData();
 
   const handleExecute = () => {
@@ -41,7 +41,7 @@ export const AddToFavoritesSingleRecordCommand = () => {
         type: NavigationMenuItemType.RECORD,
         targetRecordId: selectedRecord.id,
         targetObjectMetadataId: objectMetadataItem.id,
-        userWorkspaceId: currentWorkspaceMemberId,
+        userWorkspaceId: currentUserWorkspaceId,
         position: maxPosition + 1,
       },
     ]);
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useNavigationMenuItemsData.ts b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useNavigationMenuItemsData.ts
index 321fe1f0b4..52026f73fd 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useNavigationMenuItemsData.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/display/hooks/useNavigationMenuItemsData.ts
@@ -12,6 +12,7 @@ type NavigationMenuItemsData = {
   navigationMenuItems: NavigationMenuItem[];
   workspaceNavigationMenuItems: NavigationMenuItem[];
   currentWorkspaceMemberId: string | undefined;
+  currentUserWorkspaceId: string | undefined;
 };
 
 export const useNavigationMenuItemsData = (): NavigationMenuItemsData => {
@@ -41,5 +42,7 @@ export const useNavigationMenuItemsData = (): NavigationMenuItemsData => {
     navigationMenuItems: userNavigationMenuItems,
     workspaceNavigationMenuItems,
     currentWorkspaceMemberId,
+    currentUserWorkspaceId:
+      currentWorkspaceMember?.userWorkspaceId ?? undefined,
   };
 };
diff --git a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.ts b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.ts
index 483bbfa9b0..7d4773846b 100644
--- a/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.ts
+++ b/packages/twenty-front/src/modules/navigation-menu-item/edit/hooks/useNavigationMenuItemEditController.ts
@@ -47,7 +47,7 @@ export const useNavigationMenuItemEditController = () => {
   const {
     navigationMenuItems,
     workspaceNavigationMenuItems,
-    currentWorkspaceMemberId,
+    currentUserWorkspaceId,
   } = useNavigationMenuItemsData();
   const setNavigationMenuItemsDraft = useSetAtomState(
     navigationMenuItemsDraftState,
@@ -62,7 +62,7 @@ export const useNavigationMenuItemEditController = () => {
     : navigationMenuItems;
   const targetUserWorkspaceId = isDraftMode
     ? undefined
-    : currentWorkspaceMemberId;
+    : currentUserWorkspaceId;
 
   const createItem = (
     input: NewNavigationMenuItemInput,
diff --git a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
index 8a7a80ada4..7926c392cb 100644
--- a/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
+++ b/packages/twenty-front/src/modules/views/view-picker/components/ViewPickerOptionDropdown.tsx
@@ -56,7 +56,7 @@ export const ViewPickerOptionDropdown = ({
   const hasViewsPermission = useHasPermissionFlag(PermissionFlagType.VIEWS);
 
   const { createManyNavigationMenuItems } = useCreateManyNavigationMenuItems();
-  const { navigationMenuItems, currentWorkspaceMemberId } =
+  const { navigationMenuItems, currentUserWorkspaceId } =
     useNavigationMenuItemsData();
 
   // Users with VIEWS permission can edit all views
@@ -67,7 +67,7 @@ export const ViewPickerOptionDropdown = ({
   const isFavorite = navigationMenuItems.some(
     (item) =>
       item.viewId === view.id &&
-      item.userWorkspaceId === currentWorkspaceMemberId,
+      item.userWorkspaceId === currentUserWorkspaceId,
   );
 
   const handleDelete = () => {
@@ -92,7 +92,7 @@ export const ViewPickerOptionDropdown = ({
           id: uuidv4(),
           type: NavigationMenuItemType.VIEW,
           viewId: view.id,
-          userWorkspaceId: currentWorkspaceMemberId,
+          userWorkspaceId: currentUserWorkspaceId,
           position: maxPosition + 1,
         },
       ]);
diff --git a/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts b/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts
index fb4ee70b78..0450457cf2 100644
--- a/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts
+++ b/packages/twenty-front/src/modules/workspace-member/types/WorkspaceMember.ts
@@ -21,6 +21,7 @@ export type WorkspaceMember = {
   updatedAt: string;
   userEmail: string;
   userId: string;
+  userWorkspaceId?: string | null;
   timeZone?: string | null;
   dateFormat?: WorkspaceMemberDateFormatEnum | null;
   timeFormat?: WorkspaceMemberTimeFormatEnum | null;