diff --git a/apps/web/src/app/agents/[id]/chat/[chatId]/page.tsx b/apps/web/src/app/agents/[id]/chat/[chatId]/page.tsx
index ff09d23..9edaa85 100644
--- a/apps/web/src/app/agents/[id]/chat/[chatId]/page.tsx
+++ b/apps/web/src/app/agents/[id]/chat/[chatId]/page.tsx
@@ -887,9 +887,7 @@ export default function PublicAgentChatPage(): React.ReactElement {
                           {message.role === 'USER' && (
                             <div className="flex justify-end">
                               <div className="max-w-[80%] rounded-lg p-4 bg-primary text-primary-foreground">
-                                <div className="text-sm prose prose-sm prose-invert max-w-none">
-                                  <Streamdown>{message.content}</Streamdown>
-                                </div>
+                                <div className="text-sm whitespace-pre-wrap">{message.content}</div>
                               </div>
                             </div>
                           )}
diff --git a/apps/web/src/app/dashboard/agents/[id]/chat/[chatId]/page.tsx b/apps/web/src/app/dashboard/agents/[id]/chat/[chatId]/page.tsx
index 6af8ff6..7a58bdb 100644
--- a/apps/web/src/app/dashboard/agents/[id]/chat/[chatId]/page.tsx
+++ b/apps/web/src/app/dashboard/agents/[id]/chat/[chatId]/page.tsx
@@ -679,9 +679,13 @@ export default function AgentChatPage(): React.ReactElement {
                               : 'bg-surface-secondary'
                           }`}
                         >
-                          <div className="text-sm prose prose-sm dark:prose-invert max-w-none">
-                            <Streamdown>{message.content}</Streamdown>
-                          </div>
+                          {message.role === 'USER' ? (
+                            <div className="text-sm whitespace-pre-wrap">{message.content}</div>
+                          ) : (
+                            <div className="text-sm prose prose-sm dark:prose-invert max-w-none">
+                              <Streamdown>{message.content}</Streamdown>
+                            </div>
+                          )}
                         </div>
                       </div>
                     )}