diff --git a/common/src/services/state.service.ts b/common/src/services/state.service.ts
index 9ae48427c66..934f40a9e10 100644
--- a/common/src/services/state.service.ts
+++ b/common/src/services/state.service.ts
@@ -76,7 +76,8 @@ export class StateService<
     protected secureStorageService: StorageService,
     protected logService: LogService,
     protected stateMigrationService: StateMigrationService,
-    protected stateFactory: StateFactory<TGlobalState, TAccount>
+    protected stateFactory: StateFactory<TGlobalState, TAccount>,
+    protected useAccountCache: boolean = true
   ) {
     this.accountDiskCache = new Map<string, TAccount>();
   }
@@ -2163,9 +2164,11 @@ export class StateService<
       return null;
     }
 
-    const cachedAccount = this.accountDiskCache.get(options.userId);
-    if (cachedAccount != null) {
-      return cachedAccount;
+    if (this.useAccountCache) {
+      const cachedAccount = this.accountDiskCache.get(options.userId);
+      if (cachedAccount != null) {
+        return cachedAccount;
+      }
     }
 
     const account = options?.useSecureStorage
@@ -2176,7 +2179,9 @@ export class StateService<
         ))
       : await this.storageService.get<TAccount>(options.userId, options);
 
-    this.accountDiskCache.set(options.userId, account);
+    if (this.useAccountCache) {
+      this.accountDiskCache.set(options.userId, account);
+    }
     return account;
   }
 
@@ -2206,7 +2211,10 @@ export class StateService<
       : this.storageService;
 
     await storageLocation.save(`${options.userId}`, account, options);
-    this.accountDiskCache.delete(options.userId);
+
+    if (this.useAccountCache) {
+      this.accountDiskCache.delete(options.userId);
+    }
   }
 
   protected async saveAccountToMemory(account: TAccount): Promise<void> {
@@ -2407,7 +2415,9 @@ export class StateService<
 
   protected removeAccountFromMemory(userId: string = this.state.activeUserId): void {
     delete this.state.accounts[userId];
-    this.accountDiskCache.delete(userId);
+    if (this.useAccountCache) {
+      this.accountDiskCache.delete(userId);
+    }
   }
 
   protected async pruneInMemoryAccounts() {