diff --git a/ElementX/Sources/Screens/Timeline/TimelineTableViewController.swift b/ElementX/Sources/Screens/Timeline/TimelineTableViewController.swift
index 4fe7a5f3d..d6cdb5eb7 100644
--- a/ElementX/Sources/Screens/Timeline/TimelineTableViewController.swift
+++ b/ElementX/Sources/Screens/Timeline/TimelineTableViewController.swift
@@ -56,10 +56,6 @@ class TimelineTableViewController: UIViewController {
             
             applySnapshot()
             
-            if timelineItemsDictionary.isEmpty {
-                paginatePublisher.send()
-            }
-            
             sendLastVisibleItemReadReceipt()
         }
     }
@@ -390,6 +386,9 @@ class TimelineTableViewController: UIViewController {
         // Re-evaluate after the snapshot has been applied so the new layout is reflected.
         DispatchQueue.main.async { [weak self] in
             self?.updateReadMarkerVisibility()
+            
+            // Make sure we paginate with the final timeline geometry
+            self?.paginatePublisher.send(())
         }
     }