diff --git a/MacPass/MPSettingsHelper.m b/MacPass/MPSettingsHelper.m
index 06e2763b..af84f0c1 100644
--- a/MacPass/MPSettingsHelper.m
+++ b/MacPass/MPSettingsHelper.m
@@ -49,6 +49,7 @@ NSString *const kMPSettingsKeyCopyGeneratedPasswordToClipboard = @"CopyGenerated
 }
 
 + (void)migrateDefaults {
+  [self _removeObsolteValues];
   [self _fixEntryTableSortDescriptors];
 }
 
@@ -83,6 +84,13 @@ NSString *const kMPSettingsKeyCopyGeneratedPasswordToClipboard = @"CopyGenerated
            };
 }
 
++ (void)_removeObsolteValues {
+  /* Clear old style values */
+  for(NSString *key in @[ @"kMPSettingsKeyRememberKeyFilesForDatabases", @"MPLastDatabasePath" ]) {
+    [[NSUserDefaults standardUserDefaults] removeObjectForKey:key];
+  }
+}
+
 + (void)_fixEntryTableSortDescriptors {
   /*
    MacPass < 0.4 did use compare: for the entry table view,