diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index fa8cbd875..538b73f49 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3617,6 +3617,10 @@ typedef enum : NSUInteger {
     self.scrollDownButton.hidden = YES;
 
     self.hasUnreadMessages = NO;
+    
+    if (lastVisibleViewItem != NULL && self.lastVisibleSortId > 0) {
+        [OWSReadReceiptManager.sharedManager markAsReadLocallyBeforeSortId:self.lastVisibleSortId thread:self.thread];
+    }
 }
 
 - (void)updateLastVisibleSortId