diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
index 003e654f2..030e47a43 100644
--- a/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
+++ b/app/src/main/java/com/kunzisoft/keepass/activities/PasswordActivity.kt
@@ -247,11 +247,13 @@ class PasswordActivity : StylishActivity() {
                 newDefaultFileName = databaseFileUri ?: newDefaultFileName
             }
 
-            newDefaultFileName?.let {
-                prefs?.edit()?.apply {
+            prefs?.edit()?.apply {
+                newDefaultFileName?.let {
                     putString(KEY_DEFAULT_DATABASE_PATH, newDefaultFileName.toString())
-                    apply()
+                } ?: kotlin.run {
+                    remove(KEY_DEFAULT_DATABASE_PATH)
                 }
+                apply()
             }
 
             val backupManager = BackupManager(this@PasswordActivity)