diff --git a/custom_components/versatile_thermostat/underlyings.py b/custom_components/versatile_thermostat/underlyings.py
index 32a6995..8022902 100644
--- a/custom_components/versatile_thermostat/underlyings.py
+++ b/custom_components/versatile_thermostat/underlyings.py
@@ -79,6 +79,7 @@ class UnderlyingEntity:
         self._thermostat = thermostat
         self._type = entity_type
         self._entity_id = entity_id
+        self._hvac_mode = None
 
     def __str__(self):
         return str(self._thermostat) + "-" + self._entity_id
diff --git a/tests/test_config_flow.py b/tests/test_config_flow.py
index 84c3d3b..dff9a4b 100644
--- a/tests/test_config_flow.py
+++ b/tests/test_config_flow.py
@@ -517,6 +517,7 @@ async def test_user_config_flow_over_climate(
         CONF_USE_ADVANCED_CENTRAL_CONFIG: False,
         CONF_USED_BY_CENTRAL_BOILER: False,
         CONF_USE_CENTRAL_MODE: False,
+        CONF_SONOFF_TRZB_MODE: False,
     }
     assert result["result"]
     assert result["result"].domain == DOMAIN
@@ -1126,6 +1127,7 @@ async def test_user_config_flow_over_climate_auto_start_stop(
         CONF_USED_BY_CENTRAL_BOILER: False,
         CONF_USE_AUTO_START_STOP_FEATURE: True,
         CONF_AUTO_START_STOP_LEVEL: AUTO_START_STOP_LEVEL_MEDIUM,
+        CONF_SONOFF_TRZB_MODE: False,
     }
     assert result["result"]
     assert result["result"].domain == DOMAIN