diff --git a/frontend/src/lib/components/TokensTable.svelte b/frontend/src/lib/components/TokensTable.svelte
index 6f7fe73a83..720f1d481f 100644
--- a/frontend/src/lib/components/TokensTable.svelte
+++ b/frontend/src/lib/components/TokensTable.svelte
@@ -184,7 +184,7 @@
 						} else {
 							newTokenLabel = undefined
 							newTokenExpiration = undefined
-							newTokenWorkspace = undefined
+							newTokenWorkspace = defaultNewTokenWorkspace
 						}
 					}}
 					checked={mcpCreationMode}