diff --git a/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js b/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js
index 971ba03a0d..58fd7ea4df 100644
--- a/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js
+++ b/packages/modules/web_themes/standard_legacy/web/processAllMqttMsg.js
@@ -503,7 +503,7 @@ function handleMessage(mqttTopic, mqttPayload) {
 	else if (mqttTopic.match(/^openWB\/pv\//i)) { processPvMessages(mqttTopic, mqttPayload); }
 	else if (mqttTopic.match(/^openWB\/chargepoint\//i)) { processChargePointMessages(mqttTopic, mqttPayload); }
 	else if (mqttTopic.match(/^openWB\/vehicle\//i)) { processVehicleMessages(mqttTopic, mqttPayload); }
-	else if (mqttTopic.match(/^openWB\/general\/chargemode_config\/pv_charging\//i)) { processPvConfigMessages(mqttTopic, mqttPayload); }
+	else if (mqttTopic.match(/^openWB\/general\/chargemode_config\/bat\/mode$/i)) { processPvConfigMessages(mqttTopic, mqttPayload); }
 	else if (mqttTopic.match(/^openWB\/graph\//i)) { processGraphMessages(mqttTopic, mqttPayload); }
 	else if (mqttTopic.match(/^openWB\/optional\/ep\//i)) { processETProviderMessages(mqttTopic, mqttPayload); }
 	else if (mqttTopic.match(/^openWB\/optional\//i)) { processOptionalMessages(mqttTopic, mqttPayload); }
diff --git a/simpleAPI/src/ParameterHandler.php b/simpleAPI/src/ParameterHandler.php
index d564aa76b9..7f4ebc813b 100644
--- a/simpleAPI/src/ParameterHandler.php
+++ b/simpleAPI/src/ParameterHandler.php
@@ -1604,7 +1604,7 @@ private function setBatMode($value)
 
     /**
      * Reservierte Batterie-Ladeleistung setzen (W)
-     * Setzt openWB/set/general/chargemode_config/pv_charging/bat_power_reserve
+     * Setzt openWB/set/general/chargemode_config/bat/power_reserve
      * Ermöglicht externes Energiemanagement der Speicherreservierung ohne UI-Eingriff.
      */
     private function setBatPowerReserve($value)
@@ -1616,7 +1616,7 @@ private function setBatPowerReserve($value)
         }
 
         try {
-            $topic = "openWB/set/general/chargemode_config/pv_charging/bat_power_reserve";
+            $topic = "openWB/set/general/chargemode_config/bat/power_reserve";
 
             if ($this->mqttClient->setValue($topic, $watts)) {
                 return [