diff --git a/homeassistant/components/climate/tado.py b/homeassistant/components/climate/tado.py
index 5b20462c245eddde24b83ce67af687cf9dd4b36e..868511c0ac4ca8204694cb1c18101284ff059058 100644
--- a/homeassistant/components/climate/tado.py
+++ b/homeassistant/components/climate/tado.py
@@ -294,7 +294,7 @@ class TadoClimate(ClimateDevice):
 
         overlay = False
         overlay_data = None
-        termination = self._current_operation
+        termination = CONST_MODE_SMART_SCHEDULE
         cooling = False
         fan_speed = CONST_MODE_OFF
 
diff --git a/homeassistant/components/tado.py b/homeassistant/components/tado.py
index 1f5125d724ee48eca0d9e8bba652b5ce686f548e..cfba0a5c0c4f18aead8c27ae3d557f39fed52ea3 100644
--- a/homeassistant/components/tado.py
+++ b/homeassistant/components/tado.py
@@ -119,8 +119,10 @@ class TadoDataStore:
 
     def reset_zone_overlay(self, zone_id):
         """Wrap for resetZoneOverlay(..)."""
-        return self.tado.resetZoneOverlay(zone_id)
+        self.tado.resetZoneOverlay(zone_id)
+        self.update(no_throttle=True)  # pylint: disable=unexpected-keyword-arg
 
     def set_zone_overlay(self, zone_id, mode, temperature=None, duration=None):
         """Wrap for setZoneOverlay(..)."""
-        return self.tado.setZoneOverlay(zone_id, mode, temperature, duration)
+        self.tado.setZoneOverlay(zone_id, mode, temperature, duration)
+        self.update(no_throttle=True)  # pylint: disable=unexpected-keyword-arg