diff --git a/frontend/src/conversation/Conversation.tsx b/frontend/src/conversation/Conversation.tsx
index cf477e8f..01b8a2de 100644
--- a/frontend/src/conversation/Conversation.tsx
+++ b/frontend/src/conversation/Conversation.tsx
@@ -68,7 +68,7 @@ export default function Conversation() {
   const scrollIntoView = () => {
     if (!conversationRef?.current || eventInterrupt) return;
 
-    if (status === 'idle') {
+    if (status === 'idle' || !queries[queries.length - 1].response) {
       conversationRef.current.scrollTo({
         behavior: 'smooth',
         top: conversationRef.current.scrollHeight,