diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController+CVC.swift b/Signal/src/ViewControllers/ConversationView/ConversationViewController+CVC.swift
index 9bcda4035a..796f91c509 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController+CVC.swift
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController+CVC.swift
@@ -478,8 +478,12 @@ extension ConversationViewController: CVLoadCoordinatorDelegate {
                 case .insert(let renderItem, _):
 
                     var wasJustInserted = false
-                    if let lastMessageForInboxSortId = updateToken.lastMessageForInboxSortId,
-                       lastMessageForInboxSortId < renderItem.interaction.sortId {
+                    if let lastMessageForInboxSortId = updateToken.lastMessageForInboxSortId {
+                        if lastMessageForInboxSortId < renderItem.interaction.sortId {
+                            wasJustInserted = true
+                        }
+                    } else {
+                        // The first interaction in the thread.
                         wasJustInserted = true
                     }