diff --git a/homeassistant/components/incomfort/climate.py b/homeassistant/components/incomfort/climate.py
index dc08ce8a6c0..eccf03588dc 100644
--- a/homeassistant/components/incomfort/climate.py
+++ b/homeassistant/components/incomfort/climate.py
@@ -90,8 +90,10 @@ class InComfortClimate(IncomfortEntity, ClimateEntity):
 
         As we set the override, we report back the override. The actual set point is
         is returned at a later time.
+        Some older thermostats return 0.0 as override, in that case we fallback to
+        the actual setpoint.
         """
-        return self._room.override
+        return self._room.override or self._room.setpoint
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set a new target temperature for this zone."""
diff --git a/tests/components/incomfort/snapshots/test_climate.ambr b/tests/components/incomfort/snapshots/test_climate.ambr
index 05b2d4878d0..17adcbb3bab 100644
--- a/tests/components/incomfort/snapshots/test_climate.ambr
+++ b/tests/components/incomfort/snapshots/test_climate.ambr
@@ -1,5 +1,5 @@
 # serializer version: 1
-# name: test_setup_platform[climate.thermostat_1-entry]
+# name: test_setup_platform[legacy_thermostat][climate.thermostat_1-entry]
   EntityRegistryEntrySnapshot({
     'aliases': set({
     }),
@@ -38,7 +38,73 @@
     'unit_of_measurement': None,
   })
 # ---
-# name: test_setup_platform[climate.thermostat_1-state]
+# name: test_setup_platform[legacy_thermostat][climate.thermostat_1-state]
+  StateSnapshot({
+    'attributes': ReadOnlyDict({
+      'current_temperature': 21.4,
+      'friendly_name': 'Thermostat 1',
+      'hvac_action': <HVACAction.IDLE: 'idle'>,
+      'hvac_modes': list([
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 30.0,
+      'min_temp': 5.0,
+      'status': dict({
+        'override': 0.0,
+        'room_temp': 21.42,
+        'setpoint': 18.0,
+      }),
+      'supported_features': <ClimateEntityFeature: 1>,
+      'temperature': 18.0,
+    }),
+    'context': <ANY>,
+    'entity_id': 'climate.thermostat_1',
+    'last_changed': <ANY>,
+    'last_reported': <ANY>,
+    'last_updated': <ANY>,
+    'state': 'heat',
+  })
+# ---
+# name: test_setup_platform[new_thermostat][climate.thermostat_1-entry]
+  EntityRegistryEntrySnapshot({
+    'aliases': set({
+    }),
+    'area_id': None,
+    'capabilities': dict({
+      'hvac_modes': list([
+        <HVACMode.HEAT: 'heat'>,
+      ]),
+      'max_temp': 30.0,
+      'min_temp': 5.0,
+    }),
+    'config_entry_id': <ANY>,
+    'device_class': None,
+    'device_id': <ANY>,
+    'disabled_by': None,
+    'domain': 'climate',
+    'entity_category': None,
+    'entity_id': 'climate.thermostat_1',
+    'has_entity_name': True,
+    'hidden_by': None,
+    'icon': None,
+    'id': <ANY>,
+    'labels': set({
+    }),
+    'name': None,
+    'options': dict({
+    }),
+    'original_device_class': None,
+    'original_icon': None,
+    'original_name': None,
+    'platform': 'incomfort',
+    'previous_unique_id': None,
+    'supported_features': <ClimateEntityFeature: 1>,
+    'translation_key': None,
+    'unique_id': 'c0ffeec0ffee_1',
+    'unit_of_measurement': None,
+  })
+# ---
+# name: test_setup_platform[new_thermostat][climate.thermostat_1-state]
   StateSnapshot({
     'attributes': ReadOnlyDict({
       'current_temperature': 21.4,
diff --git a/tests/components/incomfort/test_climate.py b/tests/components/incomfort/test_climate.py
index d5f7397aaaf..ae4c1cf31f7 100644
--- a/tests/components/incomfort/test_climate.py
+++ b/tests/components/incomfort/test_climate.py
@@ -2,6 +2,7 @@
 
 from unittest.mock import MagicMock, patch
 
+import pytest
 from syrupy import SnapshotAssertion
 
 from homeassistant.config_entries import ConfigEntry
@@ -13,6 +14,14 @@ from tests.common import snapshot_platform
 
 
 @patch("homeassistant.components.incomfort.PLATFORMS", [Platform.CLIMATE])
+@pytest.mark.parametrize(
+    "mock_room_status",
+    [
+        {"room_temp": 21.42, "setpoint": 18.0, "override": 18.0},
+        {"room_temp": 21.42, "setpoint": 18.0, "override": 0.0},
+    ],
+    ids=["new_thermostat", "legacy_thermostat"],
+)
 async def test_setup_platform(
     hass: HomeAssistant,
     mock_incomfort: MagicMock,
@@ -20,6 +29,10 @@ async def test_setup_platform(
     snapshot: SnapshotAssertion,
     mock_config_entry: ConfigEntry,
 ) -> None:
-    """Test the incomfort entities are set up correctly."""
+    """Test the incomfort entities are set up correctly.
+
+    Legacy thermostats report 0.0 as override if no override is set,
+    but new thermostat sync the override with the actual setpoint instead.
+    """
     await hass.config_entries.async_setup(mock_config_entry.entry_id)
     await snapshot_platform(hass, entity_registry, snapshot, mock_config_entry.entry_id)