diff --git a/src/ise_display.cpp b/src/ise_display.cpp
index db31649..097e3c7 100644
--- a/src/ise_display.cpp
+++ b/src/ise_display.cpp
@@ -1188,13 +1188,18 @@ void ISEDisplay::toggleSystem()
     bool state = calculateAllState();
     if (state)
     {
-        setACstate(0, ac_fan_speed, ac_temperature);
+        //if AC mode is not zero, toggleAC()
+        if(ac_mode != 0) {
+            toggleAC();
+        }
         setLightGroupState(0);
         setPMstate(false, pm_fan_speed);
     }
     else
     {
-        setACstate(2, ac_fan_speed, ac_temperature);
+        if(ac_mode == 0) {
+            toggleAC();
+        }
         setLightGroupState(3);
         setPMstate(true, pm_fan_speed);
     }