diff --git a/tools/server/webui/src/lib/stores/chat.svelte.ts b/tools/server/webui/src/lib/stores/chat.svelte.ts
index c3fa9c32a9..67acd240e7 100644
--- a/tools/server/webui/src/lib/stores/chat.svelte.ts
+++ b/tools/server/webui/src/lib/stores/chat.svelte.ts
@@ -84,9 +84,13 @@ class ChatStore {
 
 	get chatWidthClasses(): { class: string; style?: string } {
 		const currentConfig = config();
+		const autoChatWidth = currentConfig.autoChatWidth;
 		const customChatWidth = currentConfig.customChatWidth;
 
-		// Custom width takes priority if set
+		if (autoChatWidth) {
+			return { class: AUTO_WIDTH_CLASSES };
+		}
+
 		if (customChatWidth) {
 			let pixelValue: number | null = null;
 
@@ -105,7 +109,7 @@ class ChatStore {
 			}
 		}
 
-		return currentConfig.autoChatWidth ? { class: AUTO_WIDTH_CLASSES } : { class: DEFAULT_WIDTH };
+		return { class: DEFAULT_WIDTH };
 	}
 
 	private setChatLoading(convId: string, loading: boolean): void {