2 files changed, 2 insertions, 0 deletions
diff --git a/src/client.cpp b/src/client.cpp
index 5f79176c7..0324bb8cc 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -1697,6 +1697,7 @@ void Client::initServerConfig(std::string serverName)
     {
         fclose(configFile);
         serverConfig.init(configPath);
+        serverConfig.setDefaultValues(getConfigDefaults());
         logger->log("serverConfigPath: " + configPath);
     }
     initPacketLimiter();
diff --git a/src/defaults.cpp b/src/defaults.cpp
index 3e53506b4..87771c427 100644
--- a/src/defaults.cpp
+++ b/src/defaults.cpp
@@ -229,6 +229,7 @@ DefaultsData* getConfigDefaults()
     AddDEF(configData, "grabinput", false);
     AddDEF(configData, "gamma", 1);
     AddDEF(configData, "vsync", 0);
+    AddDEF(configData, "enableBuggyServers", true);
     AddDEF(configData, "soundwhisper", "newmessage");
     AddDEF(configData, "soundhighlight", "reminder");
     AddDEF(configData, "soundglobal", "email");