diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 3c16f23ef..5a8e792d8 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -4075,6 +4075,10 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
 
     uint64_t lastVisibleTimestamp = self.lastVisibleTimestamp;
 
+    if (lastVisibleTimestamp == 0) {
+        // No visible messages yet. New Thread.
+        return;
+    }
     [OWSReadReceiptManager.sharedManager markAsReadLocallyBeforeTimestamp:lastVisibleTimestamp thread:self.thread];
 }