diff --git a/src/domain/session/room/timeline/TimelineViewModel.js b/src/domain/session/room/timeline/TimelineViewModel.js
index 74a1f0c9..f0435a51 100644
--- a/src/domain/session/room/timeline/TimelineViewModel.js
+++ b/src/domain/session/room/timeline/TimelineViewModel.js
@@ -63,10 +63,10 @@ export class TimelineViewModel extends ViewModel {
         };
         this.tiles.subscribe(subscription);
         const gapResult = await gapPromise;
+        this.tiles.unsubscribe(subscription);
         if (!gapResult) {
             return;
         }
-        this.tiles.unsubscribe(subscription);
         if (!hasSeenUpdate) {
             this.watchForGapFill(gapTile.notifyVisible(), gapTile);
         }