diff --git a/Duplicati/Server/Database/ApplicationSettings.cs b/Duplicati/Server/Database/ApplicationSettings.cs
index e0d34ada3..f24f27ec4 100644
--- a/Duplicati/Server/Database/ApplicationSettings.cs
+++ b/Duplicati/Server/Database/ApplicationSettings.cs
@@ -78,7 +78,10 @@ namespace Duplicati.Server.Database
                     m_values.Clear();
 
                 foreach(var k in newsettings)
-                    m_values[k.Key] = newsettings[k.Key];
+                    if (!clearExisting && newsettings[k.Key] == null && k.Key.StartsWith("--"))
+                        m_values.Remove(k.Key);
+                    else
+                        m_values[k.Key] = newsettings[k.Key];
 
                 SaveSettings();
             }