diff --git a/ts/components/conversation/media-gallery/MediaGallery.tsx b/ts/components/conversation/media-gallery/MediaGallery.tsx
index 00a8d93655..b3b449bc6c 100644
--- a/ts/components/conversation/media-gallery/MediaGallery.tsx
+++ b/ts/components/conversation/media-gallery/MediaGallery.tsx
@@ -185,7 +185,7 @@ export function MediaGallery({
   }
 
   useEffect(() => {
-    if (!scrollObserverRef.current) {
+    if (loading || !scrollObserverRef.current) {
       return;
     }
 
@@ -228,6 +228,7 @@ export function MediaGallery({
     conversationId,
     haveOldestDocument,
     haveOldestMedia,
+    loading,
     loadMoreDocuments,
     loadMoreMedia,
   ]);