diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 7f170d3695..4b050bfed8 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -117,8 +117,12 @@ module.exports = React.createClass({
         this.unmounted = true;
 
         dis.unregister(this.dispatcherRef);
-        MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
-        MatrixClientPeg.get().removeListener("Room.receipt", this.onRoomReceipt);
+
+        var client = MatrixClientPeg.get();
+        if (client) {
+            client.removeListener("Room.timeline", this.onRoomTimeline);
+            client.removeListener("Room.receipt", this.onRoomReceipt);
+        }
     },
 
     // set off a pagination request.