diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts
index 89cf968c6b..df494e6bdd 100644
--- a/src/DeviceListener.ts
+++ b/src/DeviceListener.ts
@@ -29,7 +29,6 @@ import {
     hideToast as hideUnverifiedSessionsToast,
     showToast as showUnverifiedSessionsToast,
 } from "./toasts/UnverifiedSessionToast";
-import { privateShouldBeEncrypted } from "./createRoom";
 import { isSecretStorageBeingAccessed, accessSecretStorage } from "./SecurityManager";
 import { isSecureBackupRequired } from './utils/WellKnownUtils';
 import { isLoggedIn } from './components/structures/MatrixChat';
@@ -201,9 +200,7 @@ export default class DeviceListener {
         // If we're in the middle of a secret storage operation, we're likely
         // modifying the state involved here, so don't add new toasts to setup.
         if (isSecretStorageBeingAccessed()) return false;
-        // In a default configuration, show the toasts. If the well-known config causes e2ee default to be false
-        // then do not show the toasts until user is in at least one encrypted room.
-        if (privateShouldBeEncrypted()) return true;
+        // Show setup toasts once the user is in at least one encrypted room.
         const cli = MatrixClientPeg.get();
         return cli && cli.getRooms().some(r => cli.isRoomEncrypted(r.roomId));
     }
@@ -219,8 +216,6 @@ export default class DeviceListener {
         // (we add a listener on sync to do once check after the initial sync is done)
         if (!cli.isInitialSyncComplete()) return;
 
-        // JRS: This will change again in the next PR which moves secret storage
-        // later in the process.
         const crossSigningReady = await cli.isCrossSigningReady();
         const secretStorageReady = await cli.isSecretStorageReady();
         const allSystemsReady = crossSigningReady && secretStorageReady;