diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 7e7c6564ab..236309bb29 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -185,6 +185,7 @@ module.exports = React.createClass({
     },
 
     componentWillUnmount: function() {
+        this._stopMatrixClient();
         dis.unregister(this.dispatcherRef);
         document.removeEventListener("keydown", this.onKeyDown);
         window.removeEventListener("focus", this.onFocus);
@@ -260,12 +261,7 @@ module.exports = React.createClass({
                     window.localStorage.setItem("mx_hs_url", hsUrl);
                     window.localStorage.setItem("mx_is_url", isUrl);
                 }
-                Notifier.stop();
-                UserActivity.stop();
-                Presence.stop();
-                MatrixClientPeg.get().stopClient();
-                MatrixClientPeg.get().removeAllListeners();
-                MatrixClientPeg.unset();
+                this._stopMatrixClient();
                 this.notifyNewScreen('login');
                 this.replaceState({
                     logged_in: false,
@@ -730,6 +726,16 @@ module.exports = React.createClass({
         });
     },
 
+    // stop all the background processes related to the current client
+    _stopMatrixClient: function() {
+        Notifier.stop();
+        UserActivity.stop();
+        Presence.stop();
+        MatrixClientPeg.get().stopClient();
+        MatrixClientPeg.get().removeAllListeners();
+        MatrixClientPeg.unset();
+    },
+
     onKeyDown: function(ev) {
             /*
             // Remove this for now as ctrl+alt = alt-gr so this breaks keyboards which rely on alt-gr for numbers