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 60b1de1be..8759cc86e 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
@@ -141,7 +141,7 @@ class HardwareKeyActivity: DatabaseModeActivity(){
                     context,
                     HardwareKeyActivity::class.java).apply {
                 flags = Intent.FLAG_ACTIVITY_NEW_TASK or
-                        Intent.FLAG_ACTIVITY_CLEAR_TASK
+                        Intent.FLAG_ACTIVITY_MULTIPLE_TASK
                 addHardwareKey(hardwareKey)
                 addSeed(seed)
             })
diff --git a/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt b/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
index 40f07cd28..b42b07f27 100644
--- a/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/services/DatabaseTaskNotificationService.kt
@@ -716,9 +716,9 @@ open class DatabaseTaskNotificationService : LockNotificationService(), Progress
             notifyProgressMessage()
             HardwareKeyActivity
                 .launchHardwareKeyActivity(
-                    this@DatabaseTaskNotificationService,
-                    hardwareKey,
-                    seed
+                    context = this@DatabaseTaskNotificationService,
+                    hardwareKey = hardwareKey,
+                    seed = seed
                 )
             // Wait the response
             mProgressMessage.apply {