diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index 9c2a55b4f..8e8810e4d 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -115,7 +115,7 @@
 
 	let selectedToolIds = [];
 	let imageGenerationEnabled = false;
-	let webSearchEnabled = false;
+	let webSearchEnabled = $settings?.alwaysOnWebSearch ?? false;
 
 	let chat = null;
 	let tags = [];
@@ -141,7 +141,7 @@
 			prompt = '';
 			files = [];
 			selectedToolIds = [];
-			webSearchEnabled = false;
+						
 			imageGenerationEnabled = false;
 
 			if (chatIdProp && (await loadChat())) {
@@ -716,11 +716,7 @@
 		if ($page.url.searchParams.get('web-search') === 'true') {
 			webSearchEnabled = true;
 		}
-
-		if($settings?.alwaysOnWebSearch) {
-			webSearchEnabled = true;
-		}
-
+		
 		if ($page.url.searchParams.get('image-generation') === 'true') {
 			imageGenerationEnabled = true;
 		}