diff --git a/packages/control/process.py b/packages/control/process.py
index 3e0e7bca90..4d911fb41e 100644
--- a/packages/control/process.py
+++ b/packages/control/process.py
@@ -39,10 +39,11 @@ def process_algorithm_results(self) -> None:
                         cp.initiate_phase_switch()
                         if control_parameter.state == ChargepointState.NO_CHARGING_ALLOWED and cp.data.set.current != 0:
                             control_parameter.state = ChargepointState.WAIT_FOR_USING_PHASES
-                        self._update_state(cp)
                         cp.set_timestamp_charge_start()
                     else:
                         control_parameter.state = ChargepointState.NO_CHARGING_ALLOWED
+                    self._update_state(cp)
+
                     if cp.data.get.state_str is not None:
                         Pub().pub("openWB/set/chargepoint/"+str(cp.num)+"/get/state_str",
                                   cp.data.get.state_str)
@@ -135,8 +136,9 @@ def _update_state(self, chargepoint: chargepoint.Chargepoint) -> None:
 
         chargepoint.data.set.current = current
         Pub().pub("openWB/set/chargepoint/"+str(chargepoint.num)+"/set/current", current)
-        log.info(f"LP{chargepoint.num}: set current {current} A, "
-                 f"state {ChargepointState(chargepoint.data.control_parameter.state).name}")
+        if chargepoint.data.get.plug_state:
+            log.info(f"LP{chargepoint.num}: set current {current} A, "
+                     f"state {ChargepointState(chargepoint.data.control_parameter.state).name}")
 
     def _start_charging(self, chargepoint: chargepoint.Chargepoint) -> Thread:
         return Thread(target=chargepoint.chargepoint_module.set_current,