diff --git a/CHANGELOG b/CHANGELOG
index a895281f9..872caeca3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,7 +2,7 @@ KeePassDX(4.2.0)
  * Passkeys management #1421 #2097 (Thx @cali-95)
  * Confirm usage of passkey #2165 #2124
  * Dialog to manage missing signature #2152 #2155 #2161 #2160
- * Capture error #2159
+ * Capture error #2159 #2215
  * Change Passkey Backup Eligibility & Backup State #2135 #2150 #2212
  * Search settings #2112 #2181 #2187 #2204
  * Autofill refactoring #765 #2196
diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/HardwareKeyActivity.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/HardwareKeyActivity.kt
index e11f47402..a746f0106 100644
--- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/HardwareKeyActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/activity/HardwareKeyActivity.kt
@@ -11,6 +11,8 @@ import androidx.appcompat.app.AlertDialog
 import androidx.lifecycle.lifecycleScope
 import com.kunzisoft.keepass.R
 import com.kunzisoft.keepass.activities.legacy.DatabaseModeActivity
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.setActivityResult
+import com.kunzisoft.keepass.credentialprovider.viewmodel.CredentialLauncherViewModel
 import com.kunzisoft.keepass.credentialprovider.viewmodel.HardwareKeyLauncherViewModel
 import com.kunzisoft.keepass.credentialprovider.viewmodel.HardwareKeyLauncherViewModel.Companion.addHardwareKey
 import com.kunzisoft.keepass.credentialprovider.viewmodel.HardwareKeyLauncherViewModel.Companion.addSeed
@@ -21,6 +23,7 @@ import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.hardware.HardwareKey
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.utils.AppUtil.openExternalApp
+import com.kunzisoft.keepass.view.toastError
 import kotlinx.coroutines.launch
 
 /**
@@ -70,6 +73,24 @@ class HardwareKeyActivity: DatabaseModeActivity(){
                 }
             }
         }
+        lifecycleScope.launch {
+            mHardwareKeyLauncherViewModel.credentialUiState.collect { uiState ->
+                when (uiState) {
+                    is CredentialLauncherViewModel.UIState.SetActivityResult -> {
+                        setActivityResult(
+                            lockDatabase = uiState.lockDatabase,
+                            resultCode = uiState.resultCode,
+                            data = uiState.data
+                        )
+                    }
+                    is CredentialLauncherViewModel.UIState.ShowError -> {
+                        toastError(uiState.error)
+                        mHardwareKeyLauncherViewModel.cancelResult()
+                    }
+                    else -> {}
+                }
+            }
+        }
     }
 
     override fun onDatabaseRetrieved(database: ContextualDatabase) {
diff --git a/fastlane/metadata/android/en-US/changelogs/145.txt b/fastlane/metadata/android/en-US/changelogs/145.txt
index 5b83fa66b..00ea29d5c 100644
--- a/fastlane/metadata/android/en-US/changelogs/145.txt
+++ b/fastlane/metadata/android/en-US/changelogs/145.txt
@@ -1,4 +1,4 @@
  * Passkeys management #1421
  * Add KPEX_PASSKEY_FLAG_BE and KPEX_PASSKEY_FLAG_BS flags #2212
  * Fix form filling auto search #2204
- * Small fixes #2214
\ No newline at end of file
+ * Small fixes #2214 #2215
\ No newline at end of file
diff --git a/fastlane/metadata/android/fr-FR/changelogs/145.txt b/fastlane/metadata/android/fr-FR/changelogs/145.txt
index 74928eda7..d8213a671 100644
--- a/fastlane/metadata/android/fr-FR/changelogs/145.txt
+++ b/fastlane/metadata/android/fr-FR/changelogs/145.txt
@@ -1,4 +1,4 @@
  * Gestion de Passkeys #1421
  * Ajout des flags KPEX_PASSKEY_FLAG_BE et KPEX_PASSKEY_FLAG_BS #2212
  * Correction de la recherche auto du remplissage de formulaire #2204
- * Petites corrections #2214
\ No newline at end of file
+ * Petites corrections #2214 #2215
\ No newline at end of file