2 files changed, 8 insertions, 1 deletions
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index b9725ecc..f3d92e31 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -975,6 +975,9 @@ TimelineModel::addEvents(const mtx::responses::Timeline &timeline)
     if (timeline.events.empty())
         return;
 
+    if (timeline.limited)
+        setPaginationInProgress(false);
+
     events.handleSync(timeline);
 
     using namespace mtx::events;
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index 01d80797..59ad1b37 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -398,7 +398,11 @@ public slots:
     void setThread(const QString &newThread);
     void resetThread();
     void setDecryptDescription(bool decrypt) { decryptDescription = decrypt; }
-    void clearTimeline() { events.clearTimeline(); }
+    void clearTimeline()
+    {
+        events.clearTimeline();
+        setPaginationInProgress(false);
+    }
     void resetState();
     void receivedSessionKey(const std::string &session_key)
     {