diff --git a/tools/server/public/index.html.gz b/tools/server/public/index.html.gz
index 6c557f2f01..a4c97b4c4f 100644
Binary files a/tools/server/public/index.html.gz and b/tools/server/public/index.html.gz differ
diff --git a/tools/server/webui/src/lib/components/app/notebook/NotebookScreen.svelte b/tools/server/webui/src/lib/components/app/notebook/NotebookScreen.svelte
index e1efb57055..ac40165069 100644
--- a/tools/server/webui/src/lib/components/app/notebook/NotebookScreen.svelte
+++ b/tools/server/webui/src/lib/components/app/notebook/NotebookScreen.svelte
@@ -11,8 +11,8 @@
 		KeyboardShortcutInfo,
 		ModelsSelector
 	} from '$lib/components/app';
-	import { useModelChangeValidation } from '$lib/hooks/use-model-change-validation.svelte';
-	import { modelsStore, modelOptions, selectedModelId } from '$lib/stores/models.svelte';
+
+	import { modelOptions, selectedModelId } from '$lib/stores/models.svelte';
 	import { isRouterMode } from '$lib/stores/server.svelte';
 	import * as Tooltip from '$lib/components/ui/tooltip';
 
@@ -46,7 +46,9 @@
 	// Sync local input with store content
 	$effect(() => {
 		inputContent = notebookStore.content;
-		notebookStore.updateTokenCount();
+		if (activeModelId || !isRouter) {
+			notebookStore.updateTokenCount(activeModelId);
+		}
 	});
 
 	function handleInput(e: Event) {
@@ -68,12 +70,8 @@
 			scrollToBottom();
 		}
 
-		if (notebookModel == null) {
-			notebookModel = activeModelId;
-		}
-
-		if (notebookModel) {
-			await notebookStore.generate(notebookModel);
+		if (activeModelId) {
+			await notebookStore.generate(activeModelId);
 		}
 	}
 
@@ -135,15 +133,6 @@
 	let canGenerate = $derived(inputContent.length > 0 && hasModelSelected && isSelectedModelInCache);
 	let isDisabled = $derived(!canGenerate);
 
-	let notebookModel = $state<string | null>(null);
-
-	const { handleModelChange } = useModelChangeValidation({
-		getRequiredModalities: () => ({ vision: false, audio: false }), // Notebook doesn't require modalities
-		onSuccess: async (modelName) => {
-			notebookModel = modelName;
-		}
-	});
-
 	function handleScroll() {
 		if (disableAutoScroll || !scrollContainer) return;
 
@@ -293,7 +282,7 @@
 					</Tooltip.Content>
 				</Tooltip.Root>
 
-				{#snippet generateButton(props = {})}
+				{#snippet generateButton()}
 					<Button
 						disabled={isDisabled}
 						onclick={notebookStore.isGenerating ? handleStop : handleGenerate}
@@ -328,8 +317,6 @@
 				</Tooltip.Root>
 
 				<ModelsSelector
-					currentModel={notebookModel}
-					onModelChange={handleModelChange}
 					forceForegroundText={true}
 					useGlobalSelection={true}
 					disabled={notebookStore.isGenerating}
diff --git a/tools/server/webui/src/lib/services/chat.ts b/tools/server/webui/src/lib/services/chat.ts
index d2d482024d..927ce329ae 100644
--- a/tools/server/webui/src/lib/services/chat.ts
+++ b/tools/server/webui/src/lib/services/chat.ts
@@ -1132,15 +1132,21 @@ export class ChatService {
 	 * Tokenizes the provided text using the server's tokenizer.
 	 *
 	 * @param content - The text content to tokenize
+	 * @param model - Optional model name to use for tokenization (required in router mode)
 	 * @param signal - Optional AbortSignal
 	 * @returns {Promise<number[]>} Promise that resolves to an array of token IDs
 	 */
-	static async tokenize(content: string, signal?: AbortSignal): Promise<number[]> {
+	static async tokenize(content: string, model?: string, signal?: AbortSignal): Promise<number[]> {
 		try {
+			const body: { content: string; model?: string } = { content };
+			if (model) {
+				body.model = model;
+			}
+
 			const response = await fetch('./tokenize', {
 				method: 'POST',
 				headers: getJsonHeaders(),
-				body: JSON.stringify({ content }),
+				body: JSON.stringify(body),
 				signal
 			});
 
diff --git a/tools/server/webui/src/lib/stores/notebook.svelte.ts b/tools/server/webui/src/lib/stores/notebook.svelte.ts
index cd3b3391a6..99ad5d775a 100644
--- a/tools/server/webui/src/lib/stores/notebook.svelte.ts
+++ b/tools/server/webui/src/lib/stores/notebook.svelte.ts
@@ -134,13 +134,17 @@ export class NotebookStore {
 		this.isGenerating = false;
 	}
 
-	updateTokenCount() {
+	updateTokenCount(model?: string) {
 		if (this.tokenizeTimeout) {
 			clearTimeout(this.tokenizeTimeout);
 		}
 
 		this.tokenizeTimeout = setTimeout(async () => {
-			const tokens = await ChatService.tokenize(this.content);
+			if (this.content.length === 0) {
+				this.totalTokens = 0;
+				return;
+			}
+			const tokens = await ChatService.tokenize(this.content, model);
 			this.totalTokens = tokens.length;
 		}, 500);
 	}
diff --git a/tools/server/webui/src/lib/types/api.d.ts b/tools/server/webui/src/lib/types/api.d.ts
index 46eb72501a..33e4a92c86 100644
--- a/tools/server/webui/src/lib/types/api.d.ts
+++ b/tools/server/webui/src/lib/types/api.d.ts
@@ -302,6 +302,7 @@ export interface ApiCompletionStreamChunk {
 		predicted_ms?: number;
 		cache_n?: number;
 	};
+	prompt_progress?: ChatMessagePromptProgress;
 }
 
 export interface ApiCompletionResponse {