diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 5be61d02b..6a07dff52 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -1124,6 +1124,9 @@ typedef enum : NSUInteger {
     [self autoLoadMoreIfNecessary];
 
     if (!self.viewHasEverAppeared) {
+        // Re-enable prefetching.
+        self.collectionView.prefetchingEnabled = YES;
+
         // Now that we're using a "minimal" initial load window,
         // try to increase the load window a moment after we've
         // settled into the view.
@@ -1134,9 +1137,6 @@ typedef enum : NSUInteger {
                 return;
             }
 
-            // Re-enable prefetching.
-            strongSelf.collectionView.prefetchingEnabled = YES;
-
             // Try to auto-extend the load window.
             BOOL isMainAppAndActive = CurrentAppContext().isMainAppAndActive;
             if (strongSelf.isUserScrolling || !strongSelf.isViewVisible || !isMainAppAndActive) {