diff --git a/doc/home_assistant/climate.yaml b/doc/home_assistant/climate.yaml
index 18799bc19..2ddbbece1 100644
--- a/doc/home_assistant/climate.yaml
+++ b/doc/home_assistant/climate.yaml
@@ -1,9 +1,9 @@
  - platform: mqtt
    name: Thermostat
    modes:
-     - low
-     - manual
-     - auto
+     - "auto"
+     - "manual"
+     - "off"
 
    mode_state_topic: "home/ems-esp/thermostat_data"
    current_temperature_topic: "home/ems-esp/thermostat_data"
diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index eea686639..e87d1afcc 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -1233,9 +1233,9 @@ void MQTTCallback(unsigned int type, const char * topic, const char * message) {
             myDebug("MQTT topic: thermostat mode value %s", message);
             if (strcmp((char *)message, "auto") == 0) {
                 ems_setThermostatMode(2);
-            } else if (strcmp((char *)message, "day") == 0) {
+            } else if (strcmp((char *)message, "day") == 0 || strcmp((char *)message, "manual") == 0) {
                 ems_setThermostatMode(1);
-            } else if (strcmp((char *)message, "night") == 0) {
+            } else if (strcmp((char *)message, "night") == 0 || strcmp((char *)message, "off") == 0) {
                 ems_setThermostatMode(0);
             }
         }