diff --git a/packages/control/chargepoint/chargepoint.py b/packages/control/chargepoint/chargepoint.py
index 4d9407a64e..cf01d0cb67 100644
--- a/packages/control/chargepoint/chargepoint.py
+++ b/packages/control/chargepoint/chargepoint.py
@@ -465,7 +465,9 @@ def initiate_phase_switch(self):
                     if self._is_phase_switch_required():
                         # Wenn die Umschaltverzögerung aktiv ist, darf nicht umgeschaltet werden.
                         if (self.data.control_parameter.state != ChargepointState.PERFORMING_PHASE_SWITCH and
-                                self.data.control_parameter.state != ChargepointState.WAIT_FOR_USING_PHASES):
+                                (self.data.control_parameter.state != ChargepointState.WAIT_FOR_USING_PHASES or
+                                 (self.data.control_parameter.state == ChargepointState.WAIT_FOR_USING_PHASES and
+                                  self.data.get.charge_state is False))):
                             log.debug(
                                 f"Lp {self.num}: Ladung aktiv halten "
                                 f"{charging_ev.ev_template.data.keep_charge_active_duration}s")