diff --git a/src/components/views/dialogs/SetupEncryptionDialog.js b/src/components/views/dialogs/SetupEncryptionDialog.js
index 71b7574551..d7723de588 100644
--- a/src/components/views/dialogs/SetupEncryptionDialog.js
+++ b/src/components/views/dialogs/SetupEncryptionDialog.js
@@ -38,10 +38,13 @@ export default class SetupEncryptionDialog extends React.Component {
         super();
 
         this.store = SetupEncryptionStore.sharedInstance();
-        this.store.on("update", this._onStoreUpdate);
         this.state = {icon: iconFromPhase(this.store.phase)};
     }
 
+    componentDidMount() {
+        this.store.on("update", this._onStoreUpdate);
+    }
+
     componentWillUnmount() {
         this.store.removeListener("update", this._onStoreUpdate);
     }