diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index b6e7afda..6bd20e85 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -1024,7 +1024,7 @@ void MQTT_connect() {
 		mqtt->disconnect();
 		yield();
 	} else {
-		mqtt = new MQTTClient(512);
+		mqtt = new MQTTClient(1024);
 		ws.setMqtt(mqtt);
 	}
 
diff --git a/src/mqtt/JsonMqttHandler.cpp b/src/mqtt/JsonMqttHandler.cpp
index 4f713217..9c35bd50 100644
--- a/src/mqtt/JsonMqttHandler.cpp
+++ b/src/mqtt/JsonMqttHandler.cpp
@@ -13,7 +13,7 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
 		return false;
 
     if(data->getListType() == 1) {
-        char json[192];
+        char json[256];
         snprintf_P(json, sizeof(json), JSON1_JSON,
             WiFi.macAddress().c_str(),
             clientId.c_str(),
@@ -26,7 +26,7 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
         );
         return mqtt->publish(topic, json);
     } else if(data->getListType() == 2) {
-        char json[384];
+        char json[512];
         snprintf_P(json, sizeof(json), JSON2_JSON,
             WiFi.macAddress().c_str(),
             clientId.c_str(),
@@ -52,7 +52,7 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState) {
         return mqtt->publish(topic, json);
     } else if(data->getListType() == 3) {
         if(data->getPowerFactor() == 0) {
-            char json[512];
+            char json[768];
             snprintf_P(json, sizeof(json), JSON3_JSON,
                 WiFi.macAddress().c_str(),
                 clientId.c_str(),
diff --git a/webui2.png b/webui2.png
index 71bdb478..b39ea7a6 100644
Binary files a/webui2.png and b/webui2.png differ