diff --git a/lib/Hoymiles/src/inverters/HM_Abstract.cpp b/lib/Hoymiles/src/inverters/HM_Abstract.cpp
index 64c01fd7..5fc0bbb2 100644
--- a/lib/Hoymiles/src/inverters/HM_Abstract.cpp
+++ b/lib/Hoymiles/src/inverters/HM_Abstract.cpp
@@ -97,6 +97,10 @@ bool HM_Abstract::sendSystemConfigParaRequest(HoymilesRadio* radio)
 
 bool HM_Abstract::sendActivePowerControlRequest(HoymilesRadio* radio, float limit, PowerLimitControlType type)
 {
+    if (type == PowerLimitControlType::RelativNonPersistent || type == PowerLimitControlType::RelativPersistent) {
+        limit = min<float>(100, limit);
+    }
+
     _activePowerControlLimit = limit;
     _activePowerControlType = type;
 
diff --git a/src/MqttSettings.cpp b/src/MqttSettings.cpp
index 39706709..d7e7a655 100644
--- a/src/MqttSettings.cpp
+++ b/src/MqttSettings.cpp
@@ -129,7 +129,6 @@ void MqttSettingsClass::onMqttMessage(const espMqttClientTypes::MessagePropertie
 
     if (!strcmp(setting, TOPIC_SUB_LIMIT_PERSISTENT_RELATIVE)) {
         // Set inverter limit relative persistent
-        payload_val = min<uint32_t>(100, payload_val);
         Serial.printf("Limit Persistent: %d %%\n", payload_val);
         inv->sendActivePowerControlRequest(Hoymiles.getRadio(), payload_val, PowerLimitControlType::RelativPersistent);
 
@@ -140,7 +139,6 @@ void MqttSettingsClass::onMqttMessage(const espMqttClientTypes::MessagePropertie
 
     } else if (!strcmp(setting, TOPIC_SUB_LIMIT_NONPERSISTENT_RELATIVE)) {
         // Set inverter limit relative non persistent
-        payload_val = min<uint32_t>(100, payload_val);
         Serial.printf("Limit Non-Persistent: %d %%\n", payload_val);
         if (!properties.retain) {
             inv->sendActivePowerControlRequest(Hoymiles.getRadio(), payload_val, PowerLimitControlType::RelativNonPersistent);