diff --git a/static/src/components/chat/ChatArea.vue b/static/src/components/chat/ChatArea.vue
index f0281ad..4c5fd13 100644
--- a/static/src/components/chat/ChatArea.vue
+++ b/static/src/components/chat/ChatArea.vue
@@ -142,7 +142,8 @@
                     group.action?.streaming ||
                     group.action?.type === 'text' ||
                     group.action?.type === 'thinking',
-                  'thinking-finished': group.action?.type === 'thinking' && !group.action?.streaming
+                  'thinking-finished': group.action?.type === 'thinking' && !group.action?.streaming,
+                  'no-entry-animation': !streamingMessage || index !== latestMessageIndex
                 }"
               >
                 <div
@@ -365,7 +366,8 @@
                   'completed-tool': action.type === 'tool' && !action.streaming,
                   'immediate-show':
                     action.streaming || action.type === 'text' || action.type === 'thinking',
-                  'thinking-finished': action.type === 'thinking' && !action.streaming
+                  'thinking-finished': action.type === 'thinking' && !action.streaming,
+                  'no-entry-animation': !streamingMessage || index !== latestMessageIndex
                 }"
               >
                 <div
diff --git a/static/src/styles/components/chat/_chat-area.scss b/static/src/styles/components/chat/_chat-area.scss
index 9f840b9..95a66b8 100644
--- a/static/src/styles/components/chat/_chat-area.scss
+++ b/static/src/styles/components/chat/_chat-area.scss
@@ -766,6 +766,10 @@
   animation: slideInFade 0.6s cubic-bezier(0.4, 0, 0.2, 1) both;
 }
 
+.action-item.no-entry-animation {
+  animation: none !important;
+}
+
 .action-item.streaming-content,
 .action-item.immediate-show {
   animation: quickFadeIn 0.2s ease-out both;