diff --git a/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin b/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin
index f926bb3..d92fe1c 100644
Binary files a/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin and b/Arduino_Sketch/HASwitchPlate.ino.d1_mini.bin differ
diff --git a/Arduino_Sketch/HASwitchPlate/HASwitchPlate.ino b/Arduino_Sketch/HASwitchPlate/HASwitchPlate.ino
index 40ab1da..887f815 100644
--- a/Arduino_Sketch/HASwitchPlate/HASwitchPlate.ino
+++ b/Arduino_Sketch/HASwitchPlate/HASwitchPlate.ino
@@ -48,7 +48,7 @@
 // These defaults may be overwritten with values saved by the web interface
 char wifiSSID[32] = "";
 char wifiPass[64] = "";
-char mqttServer[64] = "";
+char mqttServer[128] = "";
 char mqttPort[6] = "1883";
 char mqttUser[128] = "";
 char mqttPassword[128] = "";
@@ -2378,9 +2378,10 @@ void configSave()
   {
     serializeJson(jsonConfigValues, configFile);
     configFile.println("");
-    yield();
+    configFile.flush();
     configFile.close();
   }
+  yield();
   debugPrintFile("/config.json");
   shouldSaveConfig = false;
 }
diff --git a/Arduino_Sketch/debug/HASwitchPlate.ino.d1_mini.elf b/Arduino_Sketch/debug/HASwitchPlate.ino.d1_mini.elf
index 0d6db29..00d0989 100644
Binary files a/Arduino_Sketch/debug/HASwitchPlate.ino.d1_mini.elf and b/Arduino_Sketch/debug/HASwitchPlate.ino.d1_mini.elf differ