diff --git a/packages/core.yaml b/packages/core.yaml
index 9f8bd18..b457533 100644
--- a/packages/core.yaml
+++ b/packages/core.yaml
@@ -20,11 +20,9 @@ esphome:
     priority: -100
     then:
       lambda: !lambda |-
-        if (id(beep_mode).state){
-          id(${device_name}climate).set_beeper_state(true);
-        } else {
-          id(${device_name}climate).set_beeper_state(false);
-        }
+        id(${device_name}climate).set_beeper_state(false);
+        id(${device_name}climate).set_force_mode_state(false);
+        
         if (id(display_mode).state){
           id(${device_name}climate).set_display_state(true);
         } else {
@@ -35,11 +33,6 @@ esphome:
         } else {
           id(${device_name}climate).set_module_display_state(false);
         }
-        if (id(force_mode).state){
-          id(${device_name}climate).set_force_mode_state(true);
-        } else {
-          id(${device_name}climate).set_force_mode_state(false);
-        }
         
         if (id(vswing).active_index() == 0){
           id(${device_name}climate).set_vertical_swing_direction(esphome::tclac::VerticalSwingDirection::UP_DOWN);
@@ -85,6 +78,16 @@ esphome:
           id(${device_name}climate).set_horizontal_airflow(esphome::tclac::AirflowHorizontalDirection::RIGHT);
         } else if (id(hfixing).active_index() == 5){
           id(${device_name}climate).set_horizontal_airflow(esphome::tclac::AirflowHorizontalDirection::MAX_RIGHT);
+        
+        if (id(beep_mode).state){
+          id(${device_name}climate).set_beeper_state(true);
+        } else {
+          id(${device_name}climate).set_beeper_state(false);
+        }
+        if (id(force_mode).state){
+          id(${device_name}climate).set_force_mode_state(true);
+        } else {
+          id(${device_name}climate).set_force_mode_state(false);
         }
 
 uart: