diff --git a/frontend/src/lib/components/UserSettings.svelte b/frontend/src/lib/components/UserSettings.svelte
index a6237515cc..69a84f5337 100644
--- a/frontend/src/lib/components/UserSettings.svelte
+++ b/frontend/src/lib/components/UserSettings.svelte
@@ -33,8 +33,7 @@
 		window.location.hash = ''
 	}
 
-	function handleTokenCreated(event: CustomEvent<string>) {
-		newToken = event.detail
+	function handleTokenCreated(newToken: string) {
 		dispatch('tokenCreated', newToken)
 	}
 </script>
@@ -65,7 +64,7 @@
 				defaultNewTokenLabel={newTokenLabel}
 				defaultNewTokenWorkspace={newTokenWorkspace}
 				{scopes}
-				on:tokenCreated={handleTokenCreated}
+				onTokenCreated={handleTokenCreated}
 			/>
 		</div>
 	</DrawerContent>
diff --git a/frontend/src/lib/components/settings/TokensTable.svelte b/frontend/src/lib/components/settings/TokensTable.svelte
index 3d4371c625..dbd1e1f74b 100644
--- a/frontend/src/lib/components/settings/TokensTable.svelte
+++ b/frontend/src/lib/components/settings/TokensTable.svelte
@@ -6,7 +6,6 @@
 	import { Button } from '$lib/components/common'
 	import { Clipboard, Plus } from 'lucide-svelte'
 	import { workspaceStore, userWorkspaces, type UserWorkspace } from '$lib/stores'
-	import { createEventDispatcher } from 'svelte'
 	import ToggleButtonGroup from '../common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from '../common/toggleButton-v2/ToggleButton.svelte'
 	import Toggle from '../Toggle.svelte'
@@ -22,6 +21,7 @@
 		defaultNewTokenLabel?: string
 		defaultNewTokenWorkspace?: string
 		scopes?: string[]
+		onTokenCreated: (token: string) => void
 	}
 
 	let {
@@ -29,7 +29,8 @@
 		openWithMcpMode = false,
 		defaultNewTokenLabel,
 		defaultNewTokenWorkspace,
-		scopes
+		scopes,
+		onTokenCreated
 	}: Props = $props()
 
 	// --- Local State ---
@@ -63,8 +64,7 @@
 	}
 
 	const workspaces = $derived(ensureCurrentWorkspaceIncluded($userWorkspaces, $workspaceStore))
-	const mcpBaseUrl = $derived(`${window.location.origin}/api/mcp/w/${newTokenWorkspace}/sse?token=`)
-	const dispatch = createEventDispatcher()
+	const mcpBaseUrl = $derived(`${window.location.origin}/api/w/${newTokenWorkspace}/mcp?token=`)
 
 	$effect(() => {
 		if (openWithMcpMode) {
@@ -112,7 +112,7 @@
 				newToken = `${createdToken}`
 			}
 
-			dispatch('tokenCreated', newToken ?? newMcpToken)
+			onTokenCreated(newToken ?? newMcpToken ?? '')
 			listTokens()
 			mcpCreationMode = false
 			displayCreateToken = false