diff --git a/custom_components/badnest/climate.py b/custom_components/badnest/climate.py
index 7d5e56b..e673131 100644
--- a/custom_components/badnest/climate.py
+++ b/custom_components/badnest/climate.py
@@ -168,7 +168,7 @@ class NestClimate(ClimateDevice):
     @property
     def hvac_mode(self):
         """Return hvac target hvac state."""
-        if self.device.mode == NEST_MODE_ECO:
+        if self.device.mode is None or self.device.mode == NEST_MODE_ECO:
             # We assume the first operation in operation list is the main one
             return self._operation_list[0]