diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index a2f8eb578..b63a84a02 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3478,6 +3478,9 @@ typedef enum : NSUInteger {
     } else {
         [UIView performWithoutAnimation:^{
             [self.collectionView performBatchUpdates:batchUpdates completion:batchUpdatesCompletion];
+            if (scrollToBottom) {
+                [self scrollToBottomAnimated:NO];
+            }
         }];
     }
     self.lastReloadDate = [NSDate new];