diff --git a/src/DeviceListener.ts b/src/DeviceListener.ts
index 41daa74376..6b667ae54d 100644
--- a/src/DeviceListener.ts
+++ b/src/DeviceListener.ts
@@ -31,7 +31,7 @@ import {
 } from "./toasts/UnverifiedSessionToast";
 import { privateShouldBeEncrypted } from "./createRoom";
 import { isSecretStorageBeingAccessed, accessSecretStorage } from "./CrossSigningManager";
-import { ensureClientWellKnown, isSecureBackupRequired } from './utils/WellKnownUtils';
+import { isSecureBackupRequired } from './utils/WellKnownUtils';
 import { isLoggedIn } from './components/structures/MatrixChat';
 
 
@@ -226,7 +226,7 @@ export default class DeviceListener {
                     showSetupEncryptionToast(SetupKind.UPGRADE_ENCRYPTION);
                 } else {
                     // No cross-signing or key backup on account (set up encryption)
-                    await ensureClientWellKnown();
+                    await cli.waitForClientWellKnown();
                     if (isSecureBackupRequired() && isLoggedIn()) {
                         // If we're meant to set up, and Secure Backup is required,
                         // trigger the flow directly without a toast once logged in.
diff --git a/src/utils/WellKnownUtils.ts b/src/utils/WellKnownUtils.ts
index 1fe28f2b0c..f16acdb408 100644
--- a/src/utils/WellKnownUtils.ts
+++ b/src/utils/WellKnownUtils.ts
@@ -23,14 +23,6 @@ export interface IE2EEWellKnown {
     default?: boolean;
 }
 
-export async function ensureClientWellKnown() {
-    const cli = MatrixClientPeg.get();
-    if (cli.haveAttemptedFetchingClientWellKnown()) return;
-    return new Promise(resolve => {
-        cli.once("WellKnown.attempted", resolve);
-    });
-}
-
 export function getE2EEWellKnown(): IE2EEWellKnown {
     const clientWellKnown = MatrixClientPeg.get().getClientWellKnown();
     if (clientWellKnown && clientWellKnown[E2EE_WK_KEY]) {