diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
index 11142e12f..f339459fa 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt
@@ -378,36 +378,6 @@ class EntryEditActivity : DatabaseLockActivity(),
             } ?: run {
                 updateEntry(entrySave.oldEntry, entrySave.newEntry)
             }
-
-            // Don't wait for saving if it's to provide autofill
-            mDatabase?.let { database ->
-                EntrySelectionHelper.doSpecialAction(
-                    intent = intent,
-                    defaultAction = {},
-                    searchAction = {},
-                    selectionAction = { intentSender, typeMode, searchInfo ->
-                        when(typeMode) {
-                            TypeMode.DEFAULT -> {}
-                            TypeMode.MAGIKEYBOARD ->
-                                entryValidatedForKeyboardSelection(database, entrySave.newEntry)
-                            TypeMode.PASSKEY ->
-                                entryValidatedForPasskey(database, entrySave.newEntry)
-                            TypeMode.AUTOFILL ->
-                                entryValidatedForAutofill(database, entrySave.newEntry)
-                        }
-                    },
-                    registrationAction = { intentSender, typeMode, registerInfo ->
-                        when(typeMode) {
-                            TypeMode.DEFAULT -> {}
-                            TypeMode.MAGIKEYBOARD -> {}
-                            TypeMode.PASSKEY ->
-                                entryValidatedForPasskey(database, entrySave.newEntry)
-                            TypeMode.AUTOFILL ->
-                                entryValidatedForAutofill(database, entrySave.newEntry)
-                        }
-                    }
-                )
-            }
         }
 
         lifecycleScope.launch {
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 581fe9ddb..e11f47402 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
@@ -19,7 +19,6 @@ import com.kunzisoft.keepass.credentialprovider.viewmodel.HardwareKeyLauncherVie
 import com.kunzisoft.keepass.credentialprovider.viewmodel.HardwareKeyLauncherViewModel.UIState
 import com.kunzisoft.keepass.database.ContextualDatabase
 import com.kunzisoft.keepass.hardware.HardwareKey
-import com.kunzisoft.keepass.services.DatabaseTaskNotificationService.Companion.ACTION_DATABASE_LOAD_TASK
 import com.kunzisoft.keepass.tasks.ActionRunnable
 import com.kunzisoft.keepass.utils.AppUtil.openExternalApp
 import kotlinx.coroutines.launch
@@ -84,11 +83,7 @@ class HardwareKeyActivity: DatabaseModeActivity(){
         result: ActionRunnable.Result
     ) {
         super.onDatabaseActionFinished(database, actionTask, result)
-        when (actionTask) {
-            ACTION_DATABASE_LOAD_TASK -> {
-                finish()
-            }
-        }
+        finish()
     }
 
     private fun showHardwareKeyDriverNeeded(