diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
index 059a80c8..5bb3d838 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
@@ -1102,7 +1102,7 @@ private fun ChatMessageList(
             val isLastMessage = index == messages.lastIndex
             val isAssistant = message.role == MessageRole.ASSISTANT
 
-            if (typingEffectEnabled && isLastMessage && isAssistant &&
+            if (typingEffectEnabled && isLastMessage && isAssistant && message.isStreaming &&
                 lastAnimatedMessageId != message.id
             ) {
                 StreamingBubbleWithTypingEffect(