diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index c19f884b2a..337384b118 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -108,7 +108,10 @@ module.exports = React.createClass({
             middleOpacity: 1.0,
         });
         dis.unregister(this.dispatcherRef);
-        MatrixClientPeg.get().removeListener("RoomMember.membership", this._onInviteStateChange);
+        let cli = MatrixClientPeg.get();
+        if (cli) {
+            cli.removeListener("RoomMember.membership", this._onInviteStateChange);
+        }
     },
 
     _refreshFromServer: function() {