diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index c6d24e570..9f9f254ef 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -2957,9 +2957,10 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
     if (shouldAnimateUpdates) {
         [self.collectionView performBatchUpdates:batchUpdates completion:batchUpdatesCompletion];
     } else {
-        [UIView performWithoutAnimation:^{
-            [self.collectionView performBatchUpdates:batchUpdates completion:batchUpdatesCompletion];
-        }];
+        [CATransaction begin];
+        [CATransaction setAnimationDuration:0.f];
+        [self.collectionView performBatchUpdates:batchUpdates completion:batchUpdatesCompletion];
+        [CATransaction commit];
     }
     DDLogInfo(@"After performBatchUpdates");
     [DDLog flushLog];