diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 4af17f7a1a..186aaf6f75 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -191,7 +191,9 @@ module.exports = React.createClass({
         this.setState(newState, () => {
             // At this point, this.state.roomId could be null (e.g. the alias might not
             // have been resolved yet) so anything called here must handle this case.
-            this._onHaveRoom();
+            if (initial) {
+                this._onHaveRoom();
+            }
         });
     },