diff --git a/platform/credential-store/src/PasswordSafeImpl.kt b/platform/credential-store/src/PasswordSafeImpl.kt
index e4290e92763f..e12b28afcf6d 100644
--- a/platform/credential-store/src/PasswordSafeImpl.kt
+++ b/platform/credential-store/src/PasswordSafeImpl.kt
@@ -88,7 +88,10 @@ class PasswordSafeImpl @JvmOverloads constructor(val settings: PasswordSafeSetti
   override fun getAsync(attributes: CredentialAttributes): Promise<Credentials?> = runAsync { get(attributes) }
 
   override fun save() {
-    (currentProvider as? KeePassCredentialStore)?.save()
+    val provider = _currentProvider
+    if (provider.isInitialized()) {
+      (provider.value as? KeePassCredentialStore)?.save()
+    }
   }
 
   fun clearPasswords() {