diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte
index 6b929795f..6ef6b7d0e 100644
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -341,12 +341,12 @@
 		scrollToBottom();
 
 		const messagesBody = [
-			$settings.system || (responseMessage?.userContext ?? null)
+			$settings.system || Array.isArray(responseMessage?.userContext ?? null)
 				? {
 						role: 'system',
 						content:
-							$settings.system + (responseMessage?.userContext ?? null)
-								? `\n\nUser Context:\n${responseMessage.userContext.join('\n')}`
+							$settings.system + Array.isArray(responseMessage?.userContext ?? null)
+								? `\n\nUser Context:\n${userContext.join('\n')}`
 								: ''
 				  }
 				: undefined,
diff --git a/src/routes/(app)/c/[id]/+page.svelte b/src/routes/(app)/c/[id]/+page.svelte
index 8bf3b6d54..2da659e72 100644
--- a/src/routes/(app)/c/[id]/+page.svelte
+++ b/src/routes/(app)/c/[id]/+page.svelte
@@ -347,12 +347,12 @@
 		scrollToBottom();
 
 		const messagesBody = [
-			$settings.system || (responseMessage?.userContext ?? null)
+			$settings.system || Array.isArray(responseMessage?.userContext ?? null)
 				? {
 						role: 'system',
 						content:
-							$settings.system + (responseMessage?.userContext ?? null)
-								? `\n\nUser Context:\n${responseMessage.userContext.join('\n')}`
+							$settings.system + Array.isArray(responseMessage?.userContext ?? null)
+								? `\n\nUser Context:\n${userContext.join('\n')}`
 								: ''
 				  }
 				: undefined,