diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 52323fdb9..bf27bc164 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -168,6 +168,14 @@ _EMS_THERMOSTAT_MODE _getThermostatMode(uint8_t hc_num) {
         } else if (mode == 2) {
             thermoMode = EMS_THERMOSTAT_MODE_AUTO;
         }
+    } else { // default for all other thermostats
+        if (mode == 0) {
+            thermoMode = EMS_THERMOSTAT_MODE_NIGHT;
+        } else if (mode == 1) {
+            thermoMode = EMS_THERMOSTAT_MODE_DAY;
+        } else if (mode == 2) {
+            thermoMode = EMS_THERMOSTAT_MODE_AUTO;
+        }
     }
 
     return thermoMode;
@@ -444,6 +452,10 @@ void showInfo() {
                     myDebug_P(PSTR("   Mode is set to manual"));
                 } else if (thermoMode == EMS_THERMOSTAT_MODE_AUTO) {
                     myDebug_P(PSTR("   Mode is set to auto"));
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_NIGHT) {
+                    myDebug_P(PSTR("   Mode is set to night"));
+                } else if (thermoMode == EMS_THERMOSTAT_MODE_DAY) {
+                    myDebug_P(PSTR("   Mode is set to day"));
                 }
 
                 // Render Thermostat Day Mode
diff --git a/src/version.h b/src/version.h
index 89a25f01c..99a0cd1d7 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.4b8"
+#define APP_VERSION "1.9.4b9"