diff --git a/homeassistant/components/climate/generic_thermostat.py b/homeassistant/components/climate/generic_thermostat.py
index 5e535bf6def..3f1d9a208ac 100644
--- a/homeassistant/components/climate/generic_thermostat.py
+++ b/homeassistant/components/climate/generic_thermostat.py
@@ -231,14 +231,7 @@ class GenericThermostat(ClimateDevice):
 
     async def async_set_operation_mode(self, operation_mode):
         """Set operation mode."""
-        if operation_mode == STATE_AUTO:
-            if not self.ac_mode:
-                self._current_operation = STATE_HEAT
-            else:
-                self._current_operation = STATE_COOL
-            self._enabled = True
-            self._async_control_heating()
-        elif operation_mode == STATE_HEAT:
+        if operation_mode == STATE_HEAT:
             self._current_operation = STATE_HEAT
             self._enabled = True
             self._async_control_heating()