1 files changed, 7 insertions, 0 deletions
diff --git a/lib/Migration/MigrateConfig.php b/lib/Migration/MigrateConfig.php
index b25fb8e75..e07760d64 100644
--- a/lib/Migration/MigrateConfig.php
+++ b/lib/Migration/MigrateConfig.php
@@ -52,7 +52,14 @@ class MigrateConfig implements IRepairStep
             return;
         }
 
+        $app_keys = $this->iConfig->getAppKeys(Application::NAME);
         foreach ($this->config as $key => $value) {
+            if (!isset(Application::DEFAULT_SETTINGS[$key])) {
+                continue;
+            }
+            if (in_array($key, $app_keys)) {
+                continue;
+            }
             $this->iConfig->setAppValue(Application::NAME, $key, $value);
         }
     }