diff --git a/libs/common/src/services/vault-timeout/vault-timeout-settings.service.ts b/libs/common/src/services/vault-timeout/vault-timeout-settings.service.ts
index f34983b910..9cd6442c89 100644
--- a/libs/common/src/services/vault-timeout/vault-timeout-settings.service.ts
+++ b/libs/common/src/services/vault-timeout/vault-timeout-settings.service.ts
@@ -26,8 +26,6 @@ export class VaultTimeoutSettingsService implements VaultTimeoutSettingsServiceA
   ) {}
 
   async setVaultTimeoutOptions(timeout: number, action: VaultTimeoutAction): Promise<void> {
-    await this.stateService.setVaultTimeout(timeout);
-
     // We swap these tokens from being on disk for lock actions, and in memory for logout actions
     // Get them here to set them to their new location after changing the timeout action and clearing if needed
     const token = await this.tokenService.getToken();
@@ -35,6 +33,8 @@ export class VaultTimeoutSettingsService implements VaultTimeoutSettingsServiceA
     const clientId = await this.tokenService.getClientId();
     const clientSecret = await this.tokenService.getClientSecret();
 
+    await this.stateService.setVaultTimeout(timeout);
+
     const currentAction = await this.stateService.getVaultTimeoutAction();
     if (
       (timeout != null || timeout === 0) &&