diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index 35881ee3dc..0f8f5e5de6 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -256,7 +256,7 @@ module.exports = React.createClass({
             upgradeUsername: null,
             guestAccessToken: null,
        };
-       newState.update(state);
+       Object.assign(newState, state);
        this.setState(newState);
     },