diff --git a/app/src/main/java/app/closer/crypto/RecoveryKeyManager.kt b/app/src/main/java/app/closer/crypto/RecoveryKeyManager.kt
index 359239db..268c8300 100644
--- a/app/src/main/java/app/closer/crypto/RecoveryKeyManager.kt
+++ b/app/src/main/java/app/closer/crypto/RecoveryKeyManager.kt
@@ -1,6 +1,6 @@
 package app.closer.crypto
 
-import android.util.Base64
+import java.util.Base64
 import com.google.crypto.tink.KeysetHandle
 import com.google.crypto.tink.aead.AesGcmKeyManager
 import com.google.crypto.tink.subtle.AesGcmJce
@@ -46,8 +46,8 @@ class RecoveryKeyManager @Inject constructor() {
         val keysetBytes = serializeKeyset(keyset)
         val cipherBytes = AesGcmJce(wrapKey).encrypt(keysetBytes, WRAP_AAD)
         return WrappedKey(
-            cipherB64 = Base64.encodeToString(cipherBytes, Base64.NO_WRAP),
-            saltB64 = Base64.encodeToString(salt, Base64.NO_WRAP),
+            cipherB64 = Base64.getEncoder().encodeToString(cipherBytes),
+            saltB64 = Base64.getEncoder().encodeToString(salt),
             params = PARAMS_TAG
         )
     }
@@ -57,8 +57,8 @@ class RecoveryKeyManager @Inject constructor() {
      * (wrapped as GeneralSecurityException) if the phrase is wrong.
      */
     fun unwrap(wrapped: WrappedKey, phrase: String): KeysetHandle {
-        val salt = Base64.decode(wrapped.saltB64, Base64.NO_WRAP)
-        val cipher = Base64.decode(wrapped.cipherB64, Base64.NO_WRAP)
+        val salt = Base64.getDecoder().decode(wrapped.saltB64)
+        val cipher = Base64.getDecoder().decode(wrapped.cipherB64)
         val wrapKey = deriveKey(phrase, salt)
         val keysetBytes = AesGcmJce(wrapKey).decrypt(cipher, WRAP_AAD)
         return deserializeKeyset(keysetBytes)