diff --git a/packages/climate.yaml b/packages/climate.yaml
index 2394dd8..a5e526b 100644
--- a/packages/climate.yaml
+++ b/packages/climate.yaml
@@ -5,14 +5,17 @@ sensor:
         friendly_name: "Master Bedroom Current Temp"
         unique_id: 40c6b591-09d3-45cd-8cab-9838517cc08a
         value_template: "{{ state_attr('climate.master_bedroom_aircon','current_temperature') | float }}"
+        availability_template: "{{ states('climate.master_bedroom_aircon') not in ['unavailable','unknown'] }}"
       master_bedroom_outdoor_temp:
         friendly_name: "Master Bedroom Outdoor Temp"
         unique_id: 1a79ac59-0faf-4de5-b546-5d6d5e151dd6
         value_template: "{{ state_attr('climate.master_bedroom_aircon','outdoor_temperature') | float }}"
+        availability_template: "{{ states('climate.master_bedroom_aircon') not in ['unavailable','unknown'] }}"
       master_bedroom_target_temp:
         friendly_name: "Master Bedroom Target Temp"
         unique_id: 2ce31844-b115-42b8-8213-feccf24e236c
         value_template: "{{ state_attr('climate.master_bedroom_aircon','temperature') | float }}"
+        availability_template: "{{ states('climate.master_bedroom_aircon') not in ['unavailable','unknown'] }}"
       master_bedroom_aircon_eco_mode:
         friendly_name: "Master Bedroom Eco Mode"
         unique_id: edf36e23-adcf-4506-80eb-a14f4ea2fce0
@@ -40,6 +43,7 @@ sensor:
           {% else %}
             mdi:fan-off
           {% endif %}
+        availability_template: "{{ states('climate.master_bedroom_aircon') not in ['unavailable','unknown'] }}"
 
 input_boolean:
   master_bedroom_nighttime_protocol: