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 61b496e..5d2f927 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
@@ -357,9 +357,10 @@ export default function AgentChatPage(): React.ReactElement {
     }
   }, [activeConversationId, fetchMessages]);
 
+  // Scroll to bottom only when messages change or streaming content updates
   useEffect(() => {
     messagesEndRef.current?.scrollIntoView({ behavior: 'smooth' });
-  });
+  }, [messages.length, streamingContent]);
 
   const handleSelectConversation = (convSlug: string) => {
     router.push(`/dashboard/agents/${agentId}/chat/${convSlug}`);