diff --git a/Signal/src/ViewControllers/MediaGallery/MediaTileViewController.swift b/Signal/src/ViewControllers/MediaGallery/MediaTileViewController.swift
index 900df5a81c..f7fa9f8a41 100644
--- a/Signal/src/ViewControllers/MediaGallery/MediaTileViewController.swift
+++ b/Signal/src/ViewControllers/MediaGallery/MediaTileViewController.swift
@@ -662,21 +662,13 @@ public class MediaTileViewController: UICollectionViewController, MediaGalleryDe
         let oldContentHeight = collectionView.contentSize.height
         let direction: GalleryDirection
 
-        if contentOffsetY < kEdgeThreshold {
+        if contentOffsetY < kEdgeThreshold && !mediaGallery.hasFetchedOldest {
             // Near the top, load older content
-            guard !mediaGallery.hasFetchedOldest else {
-                return
-            }
-
             mediaTileViewLayout.recordContentSizeBeforeInsertingToTop()
             direction = .before
 
-        } else if oldContentHeight - contentOffsetY < kEdgeThreshold {
+        } else if oldContentHeight - contentOffsetY < kEdgeThreshold && !mediaGallery.hasFetchedMostRecent {
             // Near the bottom, load newer content
-            guard !mediaGallery.hasFetchedMostRecent else {
-                return
-            }
-
             direction = .after
 
         } else {