diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 361595d003..b461ef25a5 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -385,6 +385,7 @@ module.exports = React.createClass({
             this._updateTabCompleteList(this.state.room);
 
             var room = MatrixClientPeg.get().getRoom(this.props.roomId);
+            if (!room) return;
             var me = MatrixClientPeg.get().credentials.userId;
             if (this.state.joining && room.hasMembershipState(me, "join")) {
                 this.setState({