diff --git a/src/ems.cpp b/src/ems.cpp
index 62691d884..53d7d96a7 100644
--- a/src/ems.cpp
+++ b/src/ems.cpp
@@ -350,7 +350,7 @@ void _setValue(_EMS_RxTelegram * EMS_RxTelegram, uint16_t * param_op, uint8_t in
     uint16_t value = (EMS_RxTelegram->data[pos] << 8) + EMS_RxTelegram->data[pos + 1];
 
     // check for undefined/unset values, 0x8000
-    if (value == EMS_VALUE_USHORT_NOTSET) {
+    if (value >= EMS_VALUE_USHORT_NOTSET) {
         return;
     }
 
@@ -1227,6 +1227,7 @@ void _process_EasyStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_Thermostat.hc[hc].setpoint_roomTemp, EMS_OFFSET_EasyStatusMessage_setpoint); // is * 100
 }
 
+// 0x01D7, 0x01D8
 void _process_MMPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     uint8_t hc = (EMS_RxTelegram->type - EMS_TYPE_MMPLUSStatusMessage_HC1); // 0 to 3
     if (hc >= EMS_THERMOSTAT_MAXHC) {
@@ -1239,17 +1240,19 @@ void _process_MMPLUSStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
     _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].valveStatus, EMS_OFFSET_MMPLUSStatusMessage_valve_status);
 }
 
+// 0xAB, 0xAC - for MM10 HC1 and HC2 on a switch
 void _process_MMStatusMessage(_EMS_RxTelegram * EMS_RxTelegram) {
-    uint8_t hc = (EMS_RxTelegram->type - EMS_TYPE_MMStatusMessage);
-    if (hc != 0) {
+    uint8_t hc = (EMS_RxTelegram->type - EMS_TYPE_MMStatusMessage_HC1); // 0 to 3
+    if (hc >= EMS_THERMOSTAT_MAXHC) {
         return; // invalid type
     }
     EMS_Mixing.hc[hc].active = true;
 
     _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].flowTemp, EMS_OFFSET_MMStatusMessage_flow_temp);
     _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].pumpMod, EMS_OFFSET_MMStatusMessage_pump_mod);
-    //_setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].valveStatus, EMS_OFFSET_MMStatusMessage_valve_status);
     _setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].flowSetTemp, EMS_OFFSET_MMStatusMessage_flow_set);
+
+    //_setValue(EMS_RxTelegram, &EMS_Mixing.hc[hc].valveStatus, EMS_OFFSET_MMStatusMessage_valve_status);
 }
 
 /**
@@ -2726,10 +2729,11 @@ const _EMS_Type EMS_Types[] = {
     // Junkers FR10
     {EMS_DEVICE_UPDATE_FLAG_THERMOSTAT, EMS_TYPE_JunkersStatusMessage, "JunkersStatusMessage", _process_JunkersStatusMessage},
 
-    // Mixing devices
+    // Mixing devices MM10 - MM400
     {EMS_DEVICE_UPDATE_FLAG_MIXING, EMS_TYPE_MMPLUSStatusMessage_HC1, "MMPLUSStatusMessage_HC1", _process_MMPLUSStatusMessage},
     {EMS_DEVICE_UPDATE_FLAG_MIXING, EMS_TYPE_MMPLUSStatusMessage_HC2, "MMPLUSStatusMessage_HC2", _process_MMPLUSStatusMessage},
-    {EMS_DEVICE_UPDATE_FLAG_MIXING, EMS_TYPE_MMStatusMessage, "MMStatusMessage", _process_MMStatusMessage}
+    {EMS_DEVICE_UPDATE_FLAG_MIXING, EMS_TYPE_MMStatusMessage_HC1, "MMStatusMessage", _process_MMStatusMessage},
+    {EMS_DEVICE_UPDATE_FLAG_MIXING, EMS_TYPE_MMStatusMessage_HC2, "MMStatusMessage", _process_MMStatusMessage}
 
 };
 
diff --git a/src/ems_devices.h b/src/ems_devices.h
index 5a52eb7ba..3dc105356 100644
--- a/src/ems_devices.h
+++ b/src/ems_devices.h
@@ -198,7 +198,8 @@ const _EMS_Device_Types EMS_Devices_Types[] = {
 #define EMS_OFFSET_MMPLUSStatusMessage_valve_status 2 // valve in percent
 
 // MM10
-#define EMS_TYPE_MMStatusMessage 0xAB             // mixer status
+#define EMS_TYPE_MMStatusMessage_HC1 0xAB         // mixer status HC1
+#define EMS_TYPE_MMStatusMessage_HC2 0xAC         // mixer status HC2
 #define EMS_OFFSET_MMStatusMessage_flow_set 0     // flow setpoint
 #define EMS_OFFSET_MMStatusMessage_flow_temp 1    // flow temperature
 #define EMS_OFFSET_MMStatusMessage_pump_mod 3     // pump modulation in percent
diff --git a/src/ems_utils.cpp b/src/ems_utils.cpp
index 286020c13..a617018f4 100644
--- a/src/ems_utils.cpp
+++ b/src/ems_utils.cpp
@@ -76,11 +76,11 @@ char * _short_to_char(char * s, int16_t value, uint8_t decimals) {
     return s;
 }
 
-// convert short (two bytes) to text string and prints it
+// convert unsigned short (two bytes) to text string and prints it
 // decimals: 0 = no division, 1=divide value by 10, 2=divide by 2, 10=divide value by 100
 char * _ushort_to_char(char * s, uint16_t value, uint8_t decimals) {
     // remove errors or invalid values
-    if (value == EMS_VALUE_USHORT_NOTSET) {
+    if (value >= EMS_VALUE_USHORT_NOTSET) {
         strlcpy(s, "?", 10);
         return (s);
     }