From cc46fd34d7835a1cd8a5733f6968ca21ca9e3e01 Mon Sep 17 00:00:00 2001
From: Luke Barnard <lukeb@openmarket.com>
Date: Thu, 15 Jun 2017 14:21:23 +0100
Subject: [PATCH] Only stop peeking if at some point we were joined

---
 src/components/structures/RoomView.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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),