diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index cfa4038114..06e65589d1 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -590,6 +590,10 @@ module.exports = React.createClass({
     },
 
     _updateScrollMap(roomId) {
+        // No point updating scroll state if the room ID hasn't been resolved yet
+        if (!roomId) {
+            return;
+        }
         dis.dispatch({
             action: 'update_scroll_state',
             room_id: roomId,