diff --git a/lib/client.js b/lib/client.js
index 84213fbfe..96632ca63 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -1638,7 +1638,7 @@ MatrixClient.prototype.scrollback = function(room, limit, callback) {
         var matrixEvents = utils.map(res.chunk, _PojoToMatrixEventMapper(self));
         room.addEventsToTimeline(matrixEvents, true);
         room.oldState.paginationToken = res.end;
-        if (res.chunk.length < limit) {
+        if (res.chunk.length === 0) {
             room.oldState.paginationToken = null;
         }
         self.store.storeEvents(room, matrixEvents, res.end, true);