Merge branch 'master' into device-verification

1 files changed, 1 insertions, 1 deletions

diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp

index 3ecd4c75..bfc16a02 100644
--- a/src/timeline/EventStore.cpp
+++ b/src/timeline/EventStore.cpp
@@ -53,7 +53,7 @@ EventStore::EventStore(std::string room_id, QObject *)
                 this,
                 [this](const mtx::responses::Messages &res) {
                         uint64_t newFirst = cache::client()->saveOldMessages(room_id_, res);
-                        if (newFirst == first)
+                        if (newFirst == first && !res.chunk.empty())
                                 fetchMore();
                         else {
                                 emit beginInsertRows(toExternalIdx(newFirst),