diff --git a/app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivity.kt b/app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivity.kt
index 8dccacc31..536e11a96 100644
--- a/app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivity.kt
+++ b/app/src/main/java/app/passwordstore/ui/autofill/AutofillDecryptActivity.kt
@@ -72,7 +72,7 @@ class AutofillDecryptActivity : BasePgpActivity() {
     requireKeysExist {
       val gpgIdentifiers = getGpgIdentifiers("") ?: return@requireKeysExist
       if (
-        BiometricAuthenticator.canAuthenticate(this) && features.isEnabled(EnableGPGPassphraseCache)
+        features.isEnabled(EnableGPGPassphraseCache) && BiometricAuthenticator.canAuthenticate(this)
       ) {
         BiometricAuthenticator.authenticate(this) { authResult ->
           if (authResult is BiometricAuthenticator.Result.Success) {
diff --git a/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt b/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt
index 07bad2e4d..4de3c120f 100644
--- a/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt
+++ b/app/src/main/java/app/passwordstore/ui/crypto/DecryptActivity.kt
@@ -69,8 +69,8 @@ class DecryptActivity : BasePgpActivity() {
       }
     }
     if (
-      BiometricAuthenticator.canAuthenticate(this@DecryptActivity) &&
-        features.isEnabled(EnableGPGPassphraseCache)
+      features.isEnabled(EnableGPGPassphraseCache) &&
+        BiometricAuthenticator.canAuthenticate(this@DecryptActivity)
     ) {
       BiometricAuthenticator.authenticate(this@DecryptActivity) { authResult ->
         requireKeysExist { decrypt(isError = false, authResult) }