diff --git a/custom_components/foxess_em/charge/charge_service.py b/custom_components/foxess_em/charge/charge_service.py
index 61a966a..a50d080 100755
--- a/custom_components/foxess_em/charge/charge_service.py
+++ b/custom_components/foxess_em/charge/charge_service.py
@@ -110,6 +110,10 @@ async def _eco_start(self, *args) -> None:  # pylint: disable=unused-argument
                 f"Allowing battery to continue discharge until {self._perc_target}"
             )
 
+        _LOGGER.debug("Resetting switches")
+        self._battery_controller.set_boost(False)
+        self._battery_controller.set_full(False)
+
     async def _stop_force_charge(
         self, *args
     ) -> None:  # pylint: disable=unused-argument
@@ -130,7 +134,3 @@ async def _eco_end(self, *args) -> None:  # pylint: disable=unused-argument
 
         _LOGGER.debug("Releasing SoC hold")
         await self._fox.set_min_soc(self._original_soc * 100)
-
-        _LOGGER.debug("Resetting switches")
-        self._battery_controller.set_boost(False)
-        self._battery_controller.set_full(False)