diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index fa93b149d..5b634f58c 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -4227,9 +4227,10 @@ typedef enum : NSUInteger {
 {
     OWSAssertIsOnMainThread();
 
-    [self updateLastVisibleSortId];
 
     [self resetForSizeOrOrientationChange];
+
+    [self updateLastVisibleSortId];
 }
 
 #pragma mark - View Items