diff --git a/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt b/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt
index a9fc6e552..6b434920a 100644
--- a/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/viewmodels/DeviceUnlockViewModel.kt
@@ -153,10 +153,6 @@ class DeviceUnlockViewModel(application: Application): AndroidViewModel(applicat
         cipherDatabaseListener?.let {
             cipherDatabaseAction.unregisterDatabaseListener(it)
         }
-        // Reassign prompt state to open again if necessary
-        if (uiState.value.cryptoPromptState == DeviceUnlockPromptMode.IDLE_SHOW) {
-            cryptoPromptShowPending = true
-        }
         clear()
         changeMode(DeviceUnlockMode.BIOMETRIC_UNAVAILABLE)
     }
@@ -406,6 +402,10 @@ class DeviceUnlockViewModel(application: Application): AndroidViewModel(applicat
     }
 
     fun clear(checkOperation: Boolean = false) {
+        // Reassign prompt state to open again if necessary
+        if (uiState.value.cryptoPromptState == DeviceUnlockPromptMode.IDLE_SHOW) {
+            cryptoPromptShowPending = true
+        }
         if (!checkOperation || cryptoPrompt?.isDeviceCredentialOperation != true) {
             cryptoPrompt = null
             deviceUnlockManager = null