diff --git a/homeassistant/components/tado/climate.py b/homeassistant/components/tado/climate.py
index e6aa921d428..6a2067ffff1 100644
--- a/homeassistant/components/tado/climate.py
+++ b/homeassistant/components/tado/climate.py
@@ -157,8 +157,8 @@ async def create_climate_entity(
         TADO_TO_HA_HVAC_MODE_MAP[CONST_MODE_OFF],
         TADO_TO_HA_HVAC_MODE_MAP[CONST_MODE_SMART_SCHEDULE],
     ]
-    supported_fan_modes = None
-    supported_swing_modes = None
+    supported_fan_modes: list[str] | None = None
+    supported_swing_modes: list[str] | None = None
     heat_temperatures = None
     cool_temperatures = None
 
diff --git a/homeassistant/components/tado/helper.py b/homeassistant/components/tado/helper.py
index 571a757a3e8..5c515e00cf0 100644
--- a/homeassistant/components/tado/helper.py
+++ b/homeassistant/components/tado/helper.py
@@ -53,13 +53,13 @@ def decide_duration(
     return duration
 
 
-def generate_supported_fanmodes(tado_to_ha_mapping: dict[str, str], options: list[str]):
+def generate_supported_fanmodes(
+    tado_to_ha_mapping: dict[str, str], options: list[str]
+) -> list[str] | None:
     """Return correct list of fan modes or None."""
 
     supported_fanmodes = [
-        tado_to_ha_mapping.get(option)
-        for option in options
-        if tado_to_ha_mapping.get(option) is not None
+        val for option in options if (val := tado_to_ha_mapping.get(option)) is not None
     ]
     if not supported_fanmodes:
         return None