diff --git a/src/modules/home/components/MessagesWorkspace.jsx b/src/modules/home/components/MessagesWorkspace.jsx
index f3c4b7a..89dfa9a 100644
--- a/src/modules/home/components/MessagesWorkspace.jsx
+++ b/src/modules/home/components/MessagesWorkspace.jsx
@@ -1,4 +1,4 @@
-import { Fragment, useEffect, useMemo, useState } from 'react';
+import { Fragment, useEffect, useMemo, useRef, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { createAgentNote, deleteAgentNote, listAgentNotes } from '../services/agentNotesService';
 import { getCurrentUser } from '../../auth/services/sessionService';
@@ -202,6 +202,7 @@ export function MessagesWorkspace({
   isMobile = false,
 }) {
   const navigate = useNavigate();
+  const messagesRef = useRef(null);
   const currentUser = getCurrentUser();
   const currentUserId = getUserId(currentUser);
   const recentConversations = conversations.slice(0, 3);
@@ -242,6 +243,16 @@ export function MessagesWorkspace({
     setSelectedReplyIndex(0);
   }, [safeActiveConversation.id]);
 
+  useEffect(() => {
+    const container = messagesRef.current;
+    if (!container) return;
+
+    container.scrollTo({
+      top: container.scrollHeight,
+      behavior: 'auto',
+    });
+  }, [safeActiveConversation.id, safeActiveConversation.messages]);
+
   useEffect(() => {
     let isMounted = true;
 
@@ -460,6 +471,7 @@ export function MessagesWorkspace({
         </header>
 
         <div
+          ref={messagesRef}
           style={{
             padding: '1.25rem',
             display: 'grid',