diff --git a/src/EventIndexing.js b/src/EventIndexing.js
index 60482b76b5..4817df4b32 100644
--- a/src/EventIndexing.js
+++ b/src/EventIndexing.js
@@ -347,7 +347,7 @@ export default class EventIndexer {
         console.log("Seshat: Stopping crawler function");
     }
 
-    async addCheckpointForLimitedRoom(room) {
+    async onLimitedTimeline(room) {
         const indexManager = PlatformPeg.get().getEventIndexingManager();
         if (indexManager === null) return;
         if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) return;
@@ -362,21 +362,12 @@ export default class EventIndexer {
             direction: "b",
         };
 
-        const forwardsCheckpoint = {
-            roomId: room.roomId,
-            token: token,
-            fullCrawl: false,
-            direction: "f",
-        };
-
         console.log("Seshat: Added checkpoint because of a limited timeline",
-            backwardsCheckpoint, forwardsCheckpoint);
+            backwardsCheckpoint);
 
         await indexManager.addCrawlerCheckpoint(backwardsCheckpoint);
-        await indexManager.addCrawlerCheckpoint(forwardsCheckpoint);
 
         this.crawlerChekpoints.push(backwardsCheckpoint);
-        this.crawlerChekpoints.push(forwardsCheckpoint);
     }
 
     async deleteEventIndex() {
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index ccc8b5e1d6..f78bb5c168 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1310,8 +1310,8 @@ export default createReactClass({
         cli.on("Room.timelineReset", async (room, timelineSet, resetAllTimelines) => {
             const eventIndex = EventIndexPeg.get();
             if (eventIndex === null) return;
-            if (resetAllTimelines === true) return;
-            await eventIndex.addCheckpointForLimitedRoom(room);
+            if (room === null) return;
+            await eventIndex.onLimitedTimeline(room);
         });
 
         cli.on('sync', function(state, prevState, data) {