diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index a7944f91f57..2e8a39aae9e 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -318,11 +318,7 @@ module.exports = React.createClass({
 
         if (this.state.searchResults) return;
 
-        if (this.needsScrollReset) {
-            if (DEBUG_SCROLL) console.log("Resetting scroll position after tile count change");
-            this._restoreSavedScrollState();
-            this.needsScrollReset = false;
-        }
+        this._restoreSavedScrollState();
 
         // have to fill space in case we're accepting an invite
         if (!this.state.paginating) this.fillSpace();
@@ -683,10 +679,6 @@ module.exports = React.createClass({
             }
             ++count;
         }
-        if (count != this.lastEventTileCount) {
-            if (DEBUG_SCROLL) console.log("Queuing scroll reset (event count changed; now "+count+"; was "+this.lastEventTileCount+")");
-            this.needsScrollReset = true;
-        }
         this.lastEventTileCount = count;
         return ret;
     },