diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatTranscriptMerge.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatTranscriptMerge.kt
index a04c7951..474b164b 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatTranscriptMerge.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatTranscriptMerge.kt
@@ -537,7 +537,11 @@ private fun List<ChatMessage>.inTranscriptOrder(
                     Long.MAX_VALUE
                 } else {
                     precedingCanonical?.takeIf { it >= 0L }
-                        ?: latestCanonical
+                        ?: if (message.role == MessageRole.USER) {
+                            precedingCanonical ?: latestCanonical
+                        } else {
+                            latestCanonical
+                        }
                 }
             if (hasPendingPredecessor) pendingOrderByLocal[message.id] = pendingLocalOrder ?: Long.MAX_VALUE
         } else if (message.isHistoricalCache || message.isRestoredUnconfirmed) {