diff --git a/src/lib/components/chat/Chat.svelte b/src/lib/components/chat/Chat.svelte
index d83eb3cb2..8f8448847 100644
--- a/src/lib/components/chat/Chat.svelte
+++ b/src/lib/components/chat/Chat.svelte
@@ -600,10 +600,14 @@
 			files = model.info.meta.knowledge;
 		}
 		const lastUserMessage = messages.filter((message) => message.role === 'user').at(-1);
+
 		files = [
 			...files,
 			...(lastUserMessage?.files?.filter((item) =>
 				['doc', 'file', 'collection', 'web_search_results'].includes(item.type)
+			) ?? []),
+			...(responseMessage?.files?.filter((item) =>
+				['doc', 'file', 'collection', 'web_search_results'].includes(item.type)
 			) ?? [])
 		].filter(
 			// Remove duplicates
@@ -844,6 +848,9 @@
 			...files,
 			...(lastUserMessage?.files?.filter((item) =>
 				['doc', 'file', 'collection', 'web_search_results'].includes(item.type)
+			) ?? []),
+			...(responseMessage?.files?.filter((item) =>
+				['doc', 'file', 'collection', 'web_search_results'].includes(item.type)
 			) ?? [])
 		].filter(
 			// Remove duplicates
@@ -1213,6 +1220,7 @@
 
 	const getWebSearchResults = async (model: string, parentId: string, responseId: string) => {
 		const responseMessage = history.messages[responseId];
+		const userMessage = history.messages[parentId];
 
 		responseMessage.statusHistory = [
 			{
@@ -1223,7 +1231,7 @@
 		];
 		messages = messages;
 
-		const prompt = history.messages[parentId].content;
+		const prompt = userMessage.content;
 		let searchQuery = await generateSearchQuery(localStorage.token, model, messages, prompt).catch(
 			(error) => {
 				console.log(error);