diff --git a/packages/helpermodules/setdata.py b/packages/helpermodules/setdata.py
index 645bdc779a..067ede9af8 100644
--- a/packages/helpermodules/setdata.py
+++ b/packages/helpermodules/setdata.py
@@ -425,9 +425,7 @@ def process_vehicle_charge_template_topic(self, msg: mqtt.MQTTMessage):
                                 if cp.num == cp_num:
                                     # nicht an den Ladepunkt senden, der das Topic gesendet hat
                                     continue
-                                if ((cp.data.set.charging_ev != -1 and
-                                        cp.data.set.charging_ev == vehicle.num) or
-                                        cp.data.config.ev == vehicle.num):
+                                if cp.data.config.ev == vehicle.num:
                                     if decode_payload(msg.payload) == "":
                                         Pub().pub(
                                             f"openWB/chargepoint/{cp.num}/set/charge_template", "")
diff --git a/packages/helpermodules/subdata.py b/packages/helpermodules/subdata.py
index 4bb039a8f1..f26e12339e 100644
--- a/packages/helpermodules/subdata.py
+++ b/packages/helpermodules/subdata.py
@@ -480,7 +480,8 @@ def process_chargepoint_config_topic(self, var: Dict[str, chargepoint.CpTemplate
             config = dataclass_from_dict(mod.chargepoint_descriptor.configuration_factory, payload)
             var["cp"+index].chargepoint.chargepoint_module = mod.ChargepointModule(config)
             self.set_internal_chargepoint_configured()
-        if payload["type"] == "internal_openwb":
+        if (payload["type"] == "internal_openwb" and
+                payload["type"] != var["cp"+index].chargepoint.chargepoint_module.config.type):
             log.debug("Neustart des Handlers für den internen Ladepunkt.")
             self.event_stop_internal_chargepoint.set()
             self.event_start_internal_chargepoint.set()