diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp
index fca1d31d..20487b28 100644
--- a/src/timeline/EventStore.cpp
+++ b/src/timeline/EventStore.cpp
@@ -55,7 +55,7 @@ EventStore::EventStore(std::string room_id, QObject *)
           [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),