diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
index 9f39edc35..19d93f6eb 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/dialogs/DatabaseDialogFragment.kt
@@ -36,7 +36,6 @@ abstract class DatabaseDialogFragment : DialogFragment(), DatabaseRetrieval {
                                 uiState.result
                             )
                         }
-
                         else -> {}
                     }
                 }
diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt
index 9239f3d9d..2b8fcb810 100644
--- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/PasskeyLauncherActivity.kt
@@ -169,7 +169,9 @@ class PasskeyLauncherActivity : DatabaseLockActivity() {
 
     override fun onDatabaseRetrieved(database: ContextualDatabase?) {
         super.onDatabaseRetrieved(database)
-        passkeyLauncherViewModel.launchActionIfNeeded(intent, mSpecialMode, database)
+        if (database != null) {
+            passkeyLauncherViewModel.launchActionIfNeeded(intent, mSpecialMode, database)
+        }
     }
 
     override fun onDatabaseActionFinished(