From 7573dc34aa1ee8a8949d2306c37b59aaa40ff345 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Thu, 30 Jun 2022 10:00:10 -0700
Subject: [PATCH] Treat thermostat unknown state like unavailable in alexa
 (#74220)

---
 homeassistant/components/alexa/capabilities.py |  2 ++
 tests/components/alexa/test_capabilities.py    | 17 ++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/alexa/capabilities.py b/homeassistant/components/alexa/capabilities.py
index 818b4b794cf..25ec43b689c 100644
--- a/homeassistant/components/alexa/capabilities.py
+++ b/homeassistant/components/alexa/capabilities.py
@@ -1046,6 +1046,8 @@ class AlexaThermostatController(AlexaCapability):
 
             if preset in API_THERMOSTAT_PRESETS:
                 mode = API_THERMOSTAT_PRESETS[preset]
+            elif self.entity.state == STATE_UNKNOWN:
+                return None
             else:
                 mode = API_THERMOSTAT_MODES.get(self.entity.state)
                 if mode is None:
diff --git a/tests/components/alexa/test_capabilities.py b/tests/components/alexa/test_capabilities.py
index 3e176b0fb8c..ea6c96bbaef 100644
--- a/tests/components/alexa/test_capabilities.py
+++ b/tests/components/alexa/test_capabilities.py
@@ -658,13 +658,16 @@ async def test_report_climate_state(hass):
         "Alexa.TemperatureSensor", "temperature", {"value": 34.0, "scale": "CELSIUS"}
     )
 
-    hass.states.async_set(
-        "climate.unavailable",
-        "unavailable",
-        {"friendly_name": "Climate Unavailable", "supported_features": 91},
-    )
-    properties = await reported_properties(hass, "climate.unavailable")
-    properties.assert_not_has_property("Alexa.ThermostatController", "thermostatMode")
+    for state in "unavailable", "unknown":
+        hass.states.async_set(
+            f"climate.{state}",
+            state,
+            {"friendly_name": f"Climate {state}", "supported_features": 91},
+        )
+        properties = await reported_properties(hass, f"climate.{state}")
+        properties.assert_not_has_property(
+            "Alexa.ThermostatController", "thermostatMode"
+        )
 
     hass.states.async_set(
         "climate.unsupported",