diff --git a/src/background/main.background.ts b/src/background/main.background.ts
index 537b0222bf..29651d2fcd 100644
--- a/src/background/main.background.ts
+++ b/src/background/main.background.ts
@@ -161,7 +161,7 @@ export default class MainBackground {
         this.i18nService = new I18nService(BrowserApi.getUILanguage(window));
         this.cryptoFunctionService = new WebCryptoFunctionService(window, this.platformUtilsService);
         this.cryptoService = new CryptoService(this.storageService, this.secureStorageService,
-            this.cryptoFunctionService);
+            this.cryptoFunctionService, this.platformUtilsService);
         this.tokenService = new TokenService(this.storageService);
         this.appIdService = new AppIdService(this.storageService);
         this.apiService = new ApiService(this.tokenService, this.platformUtilsService,
diff --git a/src/background/nativeMessaging.background.ts b/src/background/nativeMessaging.background.ts
index e80f8fc00f..caebdc8e27 100644
--- a/src/background/nativeMessaging.background.ts
+++ b/src/background/nativeMessaging.background.ts
@@ -94,8 +94,9 @@ export class NativeMessagingBackground {
                 }
 
                 if (this.vaultTimeoutService.biometricLocked) {
-                    this.runtimeBackground.processMessage({command: 'unlocked'}, null, null);
+                    this.cryptoService.setKey(new SymmetricCryptoKey(Utils.fromB64ToArray(message.keyB64).buffer));
                     this.vaultTimeoutService.biometricLocked = false;
+                    this.runtimeBackground.processMessage({command: 'unlocked'}, null, null);
                 }
                 break;
             default: