diff --git a/src/components/structures/LoggedInView.js b/src/components/structures/LoggedInView.js
index a297952a2c..67e2fe8856 100644
--- a/src/components/structures/LoggedInView.js
+++ b/src/components/structures/LoggedInView.js
@@ -24,6 +24,7 @@ import PageTypes from '../../PageTypes';
 import sdk from '../../index';
 import dis from '../../dispatcher';
 import sessionStore from '../../stores/SessionStore';
+import MatrixClientPeg from '../../MatrixClientPeg';
 
 /**
  * This is what our MatrixChat shows when we are logged in. The precise view is
@@ -91,6 +92,16 @@ export default React.createClass({
         }
     },
 
+    // Child components assume that the client peg will not be null, so give them some
+    // sort of assurance here by only allowing a re-render if the client is truthy.
+    //
+    // This is required because `LoggedInView` maintains its own state and if this state
+    // updates after the client peg has been made null (during logout), then it will
+    // attempt to re-render and the children will throw errors.
+    shouldComponentUpdate: function() {
+        return Boolean(MatrixClientPeg.get());
+    },
+
     getScrollStateForRoom: function(roomId) {
         return this._scrollStateMap[roomId];
     },
diff --git a/src/stores/SessionStore.js b/src/stores/SessionStore.js
index 62868e4fe4..c4bd39b72c 100644
--- a/src/stores/SessionStore.js
+++ b/src/stores/SessionStore.js
@@ -69,15 +69,13 @@ class SessionStore extends Store {
                 });
                 break;
             case 'on_logged_out':
-                this.reset();
+                this._setState({
+                    cachedPassword: null,
+                });
                 break;
         }
     }
 
-    reset() {
-        this._state = Object.assign({}, INITIAL_STATE);
-    }
-
     getCachedPassword() {
         return this._state.cachedPassword;
     }