diff --git a/CHANGELOG b/CHANGELOG
index b6016826f..d7dc49151 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,6 @@
 KeePassDX(4.1.4)
  * Fix UnlockManager #2098 #2101
+ * Auto device unlock prompt #2105
 
 KeePassDX(4.1.3)
  * Fix Autofill Registration #2089
diff --git a/app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockFragment.kt b/app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockFragment.kt
index b316f4d84..a97138f31 100644
--- a/app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/biometric/DeviceUnlockFragment.kt
@@ -288,7 +288,6 @@ class DeviceUnlockFragment: Fragment() {
         // Auto open the biometric prompt
         if (mDeviceUnlockViewModel.allowAutoOpenBiometricPrompt
             && PreferencesUtil.isAdvancedUnlockPromptAutoOpenEnable(requireContext())) {
-            mDeviceUnlockViewModel.allowAutoOpenBiometricPrompt = false
             openExtractPrompt(cryptoPrompt)
         }
     }
@@ -418,10 +417,10 @@ class DeviceUnlockFragment: Fragment() {
     private fun setAuthenticationError(errorCode: Int, errString: CharSequence) {
         Log.e(TAG, "Biometric authentication error. Code : $errorCode Error : $errString")
         when (errorCode) {
-            BiometricPrompt.ERROR_NEGATIVE_BUTTON ->
-                mDeviceUnlockViewModel.setException(
-                    SecurityException(getString(R.string.error_cancel_by_user))
-                )
+            BiometricPrompt.ERROR_NEGATIVE_BUTTON,
+            BiometricPrompt.ERROR_USER_CANCELED -> {
+                // Ignore negative button
+            }
             else ->
                 mDeviceUnlockViewModel.setException(
                     SecurityException(errString.toString())
diff --git a/fastlane/metadata/android/en-US/changelogs/136.txt b/fastlane/metadata/android/en-US/changelogs/136.txt
index da78f6bc3..74a21bfed 100644
--- a/fastlane/metadata/android/en-US/changelogs/136.txt
+++ b/fastlane/metadata/android/en-US/changelogs/136.txt
@@ -1 +1,2 @@
- * Fix UnlockManager #2098 #2101
\ No newline at end of file
+ * Fix UnlockManager #2098 #2101
+ * Auto device unlock prompt #2105
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/136.txt b/fastlane/metadata/android/fr-FR/changelogs/136.txt
index 4ca55c8b9..9a152a373 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/136.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/136.txt
@@ -1 +1,2 @@
- * Correction UnlockManager #2098 #2101
\ No newline at end of file
+ * Correction UnlockManager #2098 #2101
+ * Invite de déverrouillage automatique de l'appareil #2105
\ No newline at end of file