diff --git a/web/src/components/AssistantChat/HappyThread.tsx b/web/src/components/AssistantChat/HappyThread.tsx
index aa2c01fd..bd795d1a 100644
--- a/web/src/components/AssistantChat/HappyThread.tsx
+++ b/web/src/components/AssistantChat/HappyThread.tsx
@@ -32,7 +32,7 @@ export function HappyThread(props: {
             onRetryMessage: props.onRetryMessage
         }}>
             <ThreadPrimitive.Root className="flex min-h-0 flex-1 flex-col">
-                <ThreadPrimitive.Viewport className="min-h-0 flex-1 overflow-y-auto overflow-x-hidden" autoScroll={false}>
+                <ThreadPrimitive.Viewport className="min-h-0 flex-1 overflow-y-auto overflow-x-hidden" autoScroll>
                     <div className="mx-auto w-full max-w-[720px] min-w-0 p-3">
                         {props.header}
                         <div className="flex flex-col gap-3">
diff --git a/web/src/components/SessionChat.tsx b/web/src/components/SessionChat.tsx
index a6ad8e75..c310cc8d 100644
--- a/web/src/components/SessionChat.tsx
+++ b/web/src/components/SessionChat.tsx
@@ -193,6 +193,7 @@ export function SessionChat(props: {
             <AssistantRuntimeProvider runtime={runtime}>
                 <div className="relative flex min-h-0 flex-1 flex-col">
                     <HappyThread
+                        key={props.session.id}
                         api={props.api}
                         sessionId={props.session.id}
                         metadata={props.session.metadata}