diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt
index aea891dcc..f823220f6 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/legacy/DatabaseActivity.kt
@@ -67,11 +67,13 @@ abstract class DatabaseActivity : StylishActivity(), DatabaseRetrieval {
                         }
 
                         is DatabaseViewModel.ActionState.OnDatabaseInfoChanged -> {
-                            showDatabaseChangedDialog(
-                                uiState.previousDatabaseInfo,
-                                uiState.newDatabaseInfo,
-                                uiState.readOnlyDatabase
-                            )
+                            if (manageDatabaseInfo()) {
+                                showDatabaseChangedDialog(
+                                    uiState.previousDatabaseInfo,
+                                    uiState.newDatabaseInfo,
+                                    uiState.readOnlyDatabase
+                                )
+                            }
                         }
 
                         is DatabaseViewModel.ActionState.OnDatabaseActionRequested -> {
@@ -132,6 +134,8 @@ abstract class DatabaseActivity : StylishActivity(), DatabaseRetrieval {
         // optional method implementation
     }
 
+    open fun manageDatabaseInfo(): Boolean  = true
+
     override fun onDatabaseActionFinished(
         database: ContextualDatabase,
         actionTask: String,
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 4ef3a29b8..581fe9ddb 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
@@ -37,13 +37,11 @@ class HardwareKeyActivity: DatabaseModeActivity(){
             mHardwareKeyLauncherViewModel.manageSelectionResult(it)
         }
 
-    override fun applyCustomStyle(): Boolean {
-        return false
-    }
+    override fun applyCustomStyle(): Boolean  = false
 
-    override fun showDatabaseDialog(): Boolean {
-        return false
-    }
+    override fun showDatabaseDialog(): Boolean = false
+
+    override fun manageDatabaseInfo(): Boolean = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)