diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index 240a3499a2..bbbf6dff0e 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -79,12 +79,17 @@ export default React.createClass({
         document.addEventListener('keydown', this._onKeyDown);
 
         this._sessionStore = sessionStore;
-        this._sessionStore.addListener(this._setStateFromSessionStore);
+        this._removeSSListener = this._sessionStore.addListener(
+            this._setStateFromSessionStore,
+        ).remove;
         this._setStateFromSessionStore();
     },
 
     componentWillUnmount: function() {
         document.removeEventListener('keydown', this._onKeyDown);
+        if (this._removeSSListener) {
+            this._removeSSListener();
+        }
     },
 
     getScrollStateForRoom: function(roomId) {
diff --git a/src/components/views/settings/ChangePassword.js b/src/components/views/settings/ChangePassword.js
index 4d8373bc52..07680818df 100644
--- a/src/components/views/settings/ChangePassword.js
+++ b/src/components/views/settings/ChangePassword.js
@@ -69,11 +69,19 @@ module.exports = React.createClass({
 
     componentWillMount: function() {
         this._sessionStore = sessionStore;
-        this._sessionStore.addListener(this._setStateFromSessionStore);
+        this._removeSSListener = this._sessionStore.addListener(
+            this._setStateFromSessionStore,
+        ).remove;
 
         this._setStateFromSessionStore();
     },
 
+    componentWillUnmount: function() {
+        if (this._removeSSListener) {
+            this._removeSSListener();
+        }
+    },
+
     _setStateFromSessionStore: function() {
         this.setState({
             cachedPassword: this._sessionStore.getCachedPassword(),