diff --git a/extension/js/common/settings.ts b/extension/js/common/settings.ts
index a50b930f189..cf0dceda2f6 100644
--- a/extension/js/common/settings.ts
+++ b/extension/js/common/settings.ts
@@ -88,6 +88,7 @@ export class Settings {
     if (!acctEmails.includes(acctEmail)) {
       throw new Error(`"${acctEmail}" is not a known account_email in "${JSON.stringify(acctEmails)}"`);
     }
+    await GlobalStore.acctEmailsRemove(acctEmail);
     const storageIndexesToRemove: AccountIndex[] = [];
     const filter = AbstractStore.singleScopeRawIndex(acctEmail, '');
     if (!filter) {
@@ -190,7 +191,6 @@ export class Settings {
       }
     }
     await Settings.acctStorageReset(oldAcctEmail);
-    await GlobalStore.acctEmailsRemove(oldAcctEmail);
   }
 
   public static async renderPrvCompatFixUiAndWaitTilSubmittedByUser(