diff --git a/src/ems-esp.cpp b/src/ems-esp.cpp
index e75fb833f..d1f7bdb5a 100644
--- a/src/ems-esp.cpp
+++ b/src/ems-esp.cpp
@@ -2155,6 +2155,7 @@ void loop() {
         _need_first_publish = false; // reset flag
     } else {
         // check if we're on auto mode for publishing
+        // then send EMS values, only if its been flagged to update
         if (EMSESP_Settings.publish_time == 0) {
             publishEMSValues(false);
         }
diff --git a/src/ems.cpp b/src/ems.cpp
index 4e876ecf7..4f6dd55a2 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -1354,10 +1354,10 @@ void _process_RCPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode_type, EMS_OFFSET_RCPLUSStatusMessage_mode, 1);
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].mode, EMS_OFFSET_RCPLUSStatusMessage_mode, 0); // bit 1, mode (auto=1 or manual=0)
 
-    // setpoint is in position 3 and also 6 (EMS_OFFSET_RCPLUSStatusMessage_currsetpoint). We're sticking to 3 for now.
-    // only fetch temp if in comfort mode (not eco/night mode)
+    // setpoint is in offset 3 (EMS_OFFSET_RCPLUSStatusMessage_setpoint) and also 7 (EMS_OFFSET_RCPLUSStatusMessage_currsetpoint).
+    // We're sticking to 3 for now.
     // also ignore if its 0 - see https://github.com/proddy/EMS-ESP/issues/256#issuecomment-585171426
-    if ((EMS_Thermostat.hc[hc].mode_type) && (EMS_RxTelegram->data[EMS_OFFSET_RCPLUSStatusMessage_setpoint] != 0)) {
+    if (EMS_RxTelegram->data[EMS_OFFSET_RCPLUSStatusMessage_setpoint] != 0) {
         _setValue8(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_RCPLUSStatusMessage_setpoint); // convert to single byte, value is * 2
     }
 }
diff --git a/src/version.h b/src/version.h
index 8a5332f69..a017a338b 100644
--- a/src/version.h
+++ b/src/version.h
@@ -1 +1 @@
-#define APP_VERSION "1.9.5b32"
+#define APP_VERSION "1.9.5b33"