diff --git a/src/MqttHandleInverter.cpp b/src/MqttHandleInverter.cpp
index ed620dc8..a42803cd 100644
--- a/src/MqttHandleInverter.cpp
+++ b/src/MqttHandleInverter.cpp
@@ -129,7 +129,6 @@ void MqttHandleInverterClass::publishField(std::shared_ptr<InverterAbstract> inv
     String value = String(
         inv->Statistics()->getChannelFieldValue(type, channel, fieldId),
         static_cast<unsigned int>(inv->Statistics()->getChannelFieldDigits(type, channel, fieldId)));
-    value.trim();
 
     MqttSettings.publish(topic, value);
 }
diff --git a/src/MqttSettings.cpp b/src/MqttSettings.cpp
index da0363df..d5b29faf 100644
--- a/src/MqttSettings.cpp
+++ b/src/MqttSettings.cpp
@@ -159,7 +159,11 @@ void MqttSettingsClass::publish(const String& subtopic, const String& payload)
 {
     String topic = getPrefix();
     topic += subtopic;
-    mqttClient->publish(topic.c_str(), 0, Configuration.get().Mqtt_Retain, payload.c_str());
+
+    String value = payload;
+    value.trim();
+
+    mqttClient->publish(topic.c_str(), 0, Configuration.get().Mqtt_Retain, value.c_str());
 }
 
 void MqttSettingsClass::publishGeneric(const String& topic, const String& payload, bool retain, uint8_t qos)