diff --git a/homeassistant/components/climate/generic_thermostat.py b/homeassistant/components/climate/generic_thermostat.py
index 3bf64fab2df..4bf704327d2 100644
--- a/homeassistant/components/climate/generic_thermostat.py
+++ b/homeassistant/components/climate/generic_thermostat.py
@@ -134,8 +134,8 @@ class GenericThermostat(ClimateDevice):
         if temperature is None:
             return
         self._target_temp = temperature
+        self.schedule_update_ha_state()
         self._control_heating()
-        self.update_ha_state()
 
     @property
     def min_temp(self):
@@ -163,8 +163,8 @@ class GenericThermostat(ClimateDevice):
             return
 
         self._update_temp(new_state)
-        self._control_heating()
         self.schedule_update_ha_state()
+        self._control_heating()
 
     def _switch_changed(self, entity_id, old_state, new_state):
         """Called when heater switch changes state."""