diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt
index b2030c9d4..bf60df362 100644
--- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/EntrySelectionHelper.kt
@@ -229,6 +229,10 @@ object EntrySelectionHelper {
         return getParcelableExtraCompat<ParcelUuid>(EXTRA_NODE_ID)?.uuid
     }
 
+    fun Intent.removeNodeId() {
+        removeExtra(EXTRA_NODE_ID)
+    }
+
     /**
      * Intent sender uses special retains data in callback
      */
diff --git a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/viewmodel/PasskeyLauncherViewModel.kt b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/viewmodel/PasskeyLauncherViewModel.kt
index 489a81310..a9c43bdbf 100644
--- a/app/src/main/java/com/kunzisoft/keepass/credentialprovider/viewmodel/PasskeyLauncherViewModel.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/credentialprovider/viewmodel/PasskeyLauncherViewModel.kt
@@ -12,6 +12,8 @@ import androidx.credentials.GetCredentialResponse
 import androidx.credentials.exceptions.GetCredentialUnknownException
 import androidx.credentials.provider.PendingIntentHandler
 import androidx.lifecycle.viewModelScope
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.removeInfo
+import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.removeNodeId
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveNodeId
 import com.kunzisoft.keepass.credentialprovider.EntrySelectionHelper.retrieveSearchInfo
 import com.kunzisoft.keepass.credentialprovider.SpecialMode
@@ -166,6 +168,9 @@ class PasskeyLauncherViewModel(application: Application): CredentialLauncherView
         val searchInfo = intent.retrieveSearchInfo() ?: SearchInfo()
         val appOrigin = intent.retrieveAppOrigin() ?: AppOrigin(verified = false)
         val nodeId = intent.retrieveNodeId()
+        intent.removeInfo()
+        intent.removeAppOrigin()
+        intent.removeNodeId()
         checkSecurity(intent, nodeId)
         when (specialMode) {
             SpecialMode.SELECTION -> {