diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 5f29c6e77..339badae1 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3746,7 +3746,11 @@ typedef enum : NSUInteger {
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView
 {
     [self updateLastVisibleTimestamp];
-    [self autoLoadMoreIfNecessary];
+
+    __weak ConversationViewController *weakSelf = self;
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [weakSelf autoLoadMoreIfNecessary];
+    });
 }
 
 - (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView