diff --git a/include/WebGUIAppMain.h b/include/WebGUIAppMain.h
index b5d90a8..939496e 100644
--- a/include/WebGUIAppMain.h
+++ b/include/WebGUIAppMain.h
@@ -82,7 +82,7 @@
 #if CONFIG_WEBGUIAPP_MQTT_ENABLE
         struct
         {
-            char ServerAddr[32];
+            char ServerAddr[64];
             uint16_t ServerPort;
             char SystemName[32];
             char GroupName[32];
diff --git a/src/HTTPPostSystem.c b/src/HTTPPostSystem.c
index eedd70e..4eadab2 100644
--- a/src/HTTPPostSystem.c
+++ b/src/HTTPPostSystem.c
@@ -279,7 +279,7 @@ static HTTP_IO_RESULT HTTPPostAdaptersSettings(httpd_req_t *req, char *PostData)
 
 static HTTP_IO_RESULT HTTPPostServicesSettings(httpd_req_t *req, char *PostData)
 {
-    char tmp[33];
+    char tmp[64];
 #if CONFIG_WEBGUIAPP_MQTT_ENABLE
     bool TempIsMQTT1Enabled = false;
 #if CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM == 2
diff --git a/src/MQTT.c b/src/MQTT.c
index 8e63ebf..87f92c7 100644
--- a/src/MQTT.c
+++ b/src/MQTT.c
@@ -242,8 +242,8 @@ static void start_mqtt()
 {
     esp_mqtt_client_config_t mqtt_cfg = { 0 };
 
-    char url[40];
-    char tmp[40];
+    char url[72];
+    char tmp[72];
 
     for (int i = 0; i < CONFIG_WEBGUIAPP_MQTT_CLIENTS_NUM; ++i)
     {