diff --git a/src/components/structures/MatrixChat.tsx b/src/components/structures/MatrixChat.tsx
index 2f6c5bf353..9520815134 100644
--- a/src/components/structures/MatrixChat.tsx
+++ b/src/components/structures/MatrixChat.tsx
@@ -364,6 +364,9 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
     private async postLoginSetup() {
         const cli = MatrixClientPeg.get();
         const cryptoEnabled = cli.isCryptoEnabled();
+        if (!cryptoEnabled) {
+            this.onLoggedIn();
+        }
 
         const promisesList = [this.firstSyncPromise.promise];
         if (cryptoEnabled) {