diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index d05da63f54..803707daf6 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -259,7 +259,8 @@ module.exports = React.createClass({
                     }
                 }).done();
             }
-        } else {
+        } else if (room) {
+            // Stop peeking because we have joined this room previously
             MatrixClientPeg.get().stopPeeking();
             this.setState({
                 unsentMessageError: this._getUnsentMessageError(room),