diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 4ee502dd5f..4bf6fc5070 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -230,7 +230,8 @@ module.exports = React.createClass({
         if (room) {
             this._updateAutoComplete(room);
             this.tabComplete.loadEntries(room);
-        } else if (!this.state.joining && this.state.roomId) {
+        }
+        if (!room && !this.state.joining && this.state.roomId) {
             if (this.props.autoJoin) {
                 this.onJoinButtonClicked();
             } else {