diff --git a/packages/helpermodules/subdata.py b/packages/helpermodules/subdata.py
index 503259077d..3049d98be4 100644
--- a/packages/helpermodules/subdata.py
+++ b/packages/helpermodules/subdata.py
@@ -630,8 +630,10 @@ def process_general_topic(self, var: general.General, msg: mqtt.MQTTMessage):
                 if re.search("/general/prices/", msg.topic) is not None:
                     self.set_json_payload_class(var.data.prices, msg)
                 elif re.search("/general/chargemode_config/", msg.topic) is not None:
-                    if re.search("/general/chargemode_config/pv_charging/", msg.topic) is not None:
-                        self.set_json_payload_class(var.data.chargemode_config.pv_charging, msg)
+                    if re.search("/general/chargemode_config/surplus/vehicle", msg.topic) is not None:
+                        self.set_json_payload_class(var.data.chargemode_config.surplus.vehicle, msg)
+                    elif re.search("/general/chargemode_config/surplus/", msg.topic) is not None:
+                        self.set_json_payload_class(var.data.chargemode_config.surplus, msg)
                     else:
                         self.set_json_payload_class(var.data.chargemode_config, msg)
                 elif "openWB/general/extern" == msg.topic: