diff --git a/frontend/src/lib/components/TokensTable.svelte b/frontend/src/lib/components/TokensTable.svelte
index 3efbe53e89..a4e73b0470 100644
--- a/frontend/src/lib/components/TokensTable.svelte
+++ b/frontend/src/lib/components/TokensTable.svelte
@@ -75,7 +75,7 @@
 					label: newTokenLabel,
 					expiration: date?.toISOString(),
 					scopes: tokenScopes,
-					workspace_id: newTokenWorkspace || $workspaceStore
+					workspace_id: mcpMode ? (newTokenWorkspace || $workspaceStore) : undefined
 				} as NewToken
 			})