diff --git a/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy b/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy
index 8c190b2..d51b45a 100644
--- a/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy
+++ b/devicetypes/smartthings/ecobee-thermostat.src/ecobee-thermostat.groovy
@@ -381,10 +381,12 @@ def getDataByName(String name) {
 
 def setThermostatMode(String value) {
 	log.debug "setThermostatMode({$value})"
+	switchToMode(value)
 }
 
 def setThermostatFanMode(String value) {
 	log.debug "setThermostatFanMode({$value})"
+	switchToFanMode(value)
 }
 
 def generateModeEvent(mode) {