diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index 9678f7a7e..c839ae14f 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -750,11 +750,8 @@ void publishValues(bool force) {
     }
 
     // handle the thermostat values separately
-    if (ems_getThermostatEnabled()) {
-        // only send thermostat values if we actually have them
-        if ((EMS_Thermostat.curr_roomTemp == EMS_VALUE_SHORT_NOTSET) || (EMS_Thermostat.setpoint_roomTemp == EMS_VALUE_SHORT_NOTSET))
-            return;
-
+    // only send thermostat values if we actually have them
+    if (ems_getThermostatEnabled() && ((EMS_Thermostat.curr_roomTemp != EMS_VALUE_SHORT_NOTSET) && (EMS_Thermostat.setpoint_roomTemp != EMS_VALUE_SHORT_NOTSET))) {
         // build new json object
         doc.clear();
         JsonObject rootThermostat = doc.to<JsonObject>();
@@ -825,8 +822,6 @@ void publishValues(bool force) {
         }
     }
 
-    // handle the other values separately
-
     // For SM10 and SM100 Solar Modules
     if (ems_getSolarModuleEnabled()) {
         // build new json object
diff --git a/src/version.h b/src/version.h
index 8e757aa09..5e6f58bb3 100644
--- a/src/version.h
+++ b/src/version.h
@@ -6,5 +6,5 @@
 #pragma once
 
 #define APP_NAME "EMS-ESP"
-#define APP_VERSION "1.8.1b11"
+#define APP_VERSION "1.8.1b12"
 #define APP_HOSTNAME "ems-esp"