diff --git a/PLC/POUs/MAIN.TcPOU b/PLC/POUs/MAIN.TcPOU
index 4923eb8..4179592 100644
--- a/PLC/POUs/MAIN.TcPOU
+++ b/PLC/POUs/MAIN.TcPOU
@@ -593,13 +593,14 @@ CASE _eBMSControlMode OF
 		_xAllComponentsToManualMode := FALSE;
 		_xInSafetyCheckMode := FALSE;
 		_xReleaseManualMode := FALSE;
-		IF (_iState <> 30) OR GVL_SCADA.stAutomaticModeHMI.diSetpointAutomatic = 0 THEN
-			_rAutoPowerRequest := DINT_TO_REAL(GVL_SCADA.stAutomaticModeHMI.diSetpointAutomatic);
-		END_IF
+		//IF (_iState <> 30) OR GVL_SCADA.stAutomaticModeHMI.diSetpointAutomatic = 0 THEN
+		_rAutoPowerRequest := DINT_TO_REAL(GVL_SCADA.stAutomaticModeHMI.diSetpointAutomatic);
+		//END_IF
 		IF (GVL_SCADA.eRequestedControlMode <> _eBMSControlMode) AND (GVL_SCADA.xCanChangeControlMode) THEN
 			_eBMSControlMode := GVL_SCADA.eRequestedControlMode;
 		END_IF
 		SM_AUTO();
+		GVL_SCADA.stAutomaticModeHMI.diSetpointAutomatic := REAL_TO_DINT(_rAutoPowerRequest);
 END_CASE
 
 GVL_SCADA.xCanChangeControlMode := _xCanChangeMode;