diff --git a/src/EventIndexing.js b/src/EventIndexing.js
index ebd2ffe983..bf3f50690f 100644
--- a/src/EventIndexing.js
+++ b/src/EventIndexing.js
@@ -347,15 +347,10 @@ export default class EventIndexer {
         console.log("Seshat: Stopping crawler function");
     }
 
-    async addCheckpointForLimitedRoom(roomId) {
+    async addCheckpointForLimitedRoom(room) {
         const platform = PlatformPeg.get();
         if (!platform.supportsEventIndexing()) return;
-        if (!MatrixClientPeg.get().isRoomEncrypted(roomId)) return;
-
-        const client = MatrixClientPeg.get();
-        const room = client.getRoom(roomId);
-
-        if (room === null) return;
+        if (!MatrixClientPeg.get().isRoomEncrypted(room.roomId)) return;
 
         const timeline = room.getLiveTimeline();
         const token = timeline.getPaginationToken("b");
diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 0d3d5abd55..ccc8b5e1d6 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -1223,8 +1223,6 @@ export default createReactClass({
      * Called when the session is logged out
      */
     _onLoggedOut: async function() {
-        const platform = PlatformPeg.get();
-
         this.notifyNewScreen('login');
         this.setStateForNewView({
             view: VIEWS.LOGIN,
@@ -1313,7 +1311,7 @@ export default createReactClass({
             const eventIndex = EventIndexPeg.get();
             if (eventIndex === null) return;
             if (resetAllTimelines === true) return;
-            await eventIndex.addCheckpointForLimitedRoom(roomId);
+            await eventIndex.addCheckpointForLimitedRoom(room);
         });
 
         cli.on('sync', function(state, prevState, data) {