diff --git a/packages/control/chargepoint/chargepoint_data.py b/packages/control/chargepoint/chargepoint_data.py
index bc601a5247..b346e336aa 100644
--- a/packages/control/chargepoint/chargepoint_data.py
+++ b/packages/control/chargepoint/chargepoint_data.py
@@ -154,8 +154,7 @@ def log_factory() -> Log:
 
 @dataclass
 class Set:
-    charge_template: ChargeTemplate = field(default_factory=charge_template_factory,
-                                            metadata={"topic": "set/charge_template"})
+    charge_template: ChargeTemplate = field(default_factory=charge_template_factory)
     current: float = field(default=0, metadata={"topic": "set/current"})
     ev_prev: int = field(default=0, metadata={"topic": "set/ev_prev"})
     log: Log = field(default_factory=log_factory, metadata={"topic": "set/log"})
diff --git a/packages/control/ev/charge_template.py b/packages/control/ev/charge_template.py
index f96976fd76..1a235c1422 100644
--- a/packages/control/ev/charge_template.py
+++ b/packages/control/ev/charge_template.py
@@ -134,7 +134,7 @@ class ChargeTemplate:
     """ Klasse der Lade-Profile
     """
     data: ChargeTemplateData = field(default_factory=charge_template_data_factory, metadata={
-        "topic": ""})
+        "topic": "set/charge_template"})
 
     CHARGING_PRICE_EXCEEDED = ("Der aktuelle Strompreis liegt über dem maximalen Strompreis. ")
     CHARGING_PRICE_LOW = "Laden, da der aktuelle Strompreis unter dem maximalen Strompreis liegt."