diff --git a/src/accessory/thermostat-accessory.ts b/src/accessory/thermostat-accessory.ts
index 6188e04..55e687b 100644
--- a/src/accessory/thermostat-accessory.ts
+++ b/src/accessory/thermostat-accessory.ts
@@ -312,6 +312,12 @@ export default class ThermostatAccessory extends BaseAccessory {
     }
     const units = maybeTemp.value.scale.toLowerCase() as TemperatureScale;
     const newTemp = tempMapper.mapHomeKitTempToAlexa(value, units);
+    try {
+      const userSelectedState = await this.handleTargetStateGet();
+      await this.handleTargetStateSet(userSelectedState);
+    } catch (e) {
+      this.logWithContext('debug', 'Attempting to reset thermostat state failure, this might not be an issue');
+    }
     return pipe(
       this.platform.alexaApi.setDeviceState(
         this.device.id,