diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
index 3b2ab1c08..17b556285 100644
--- a/src/devices/boiler.cpp
+++ b/src/devices/boiler.cpp
@@ -617,7 +617,7 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
                               FL_(auxHeaterOff),
                               DeviceValueUOM::NONE,
                               MAKE_CF_CB(set_additionalHeater));
-        register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &auxHeaterStatus_, DeviceValueType::BOOL, FL_(auxHeaterStatus), DeviceValueUOM::NONE);
+        register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &auxHeaterStatus_, DeviceValueType::UINT8, FL_(auxHeaterStatus), DeviceValueUOM::PERCENT);
         register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
                               &auxHeaterDelay_,
                               DeviceValueType::UINT16,
@@ -1562,14 +1562,15 @@ void Boiler::process_UBAEnergySupplied(std::shared_ptr<const Telegram> telegram)
 //XR1A050001   A05 Pump Heat circuit (1.0 ) 1 >> 1 & 0x01 ?
 //XR1A040001   A04 Pump Cold circuit (1.0 ) 1 & 0x1 ?
 void Boiler::process_HpPower(std::shared_ptr<const Telegram> telegram) {
-    has_update(telegram, hpPower_, 11);
+    has_bitupdate(telegram, hpSwitchValve_, 0, 4);
     has_bitupdate(telegram, hpCompOn_, 3, 4);
     has_bitupdate(telegram, hpEA0_, 3, 6);
-    has_update(telegram, hpBrinePumpSpd_, 5);
-    has_update(telegram, hpCompSpd_, 17);
     has_update(telegram, hpCircSpd_, 4);
-    has_bitupdate(telegram, hpSwitchValve_, 0, 4);
+    has_update(telegram, hpBrinePumpSpd_, 5);
+    has_update(telegram, auxHeaterStatus_, 6);
     has_update(telegram, hpActivity_, 7);
+    has_update(telegram, hpPower_, 11);
+    has_update(telegram, hpCompSpd_, 17);
 
     // has_update(hpHeatingOn_, hpActivity_ == 1 ? 0xFF : 0);
     // has_update(hpCoolingOn_, hpActivity_ == 2 ? 0xFF : 0);
@@ -1861,7 +1862,7 @@ void Boiler::process_HpSilentMode(std::shared_ptr<const Telegram> telegram) {
 
 // Boiler(0x08) -B-> All(0x00), ?(0x0488), data: 8E 00 00 00 00 00 01 03
 void Boiler::process_HpValve(std::shared_ptr<const Telegram> telegram) {
-    has_bitupdate(telegram, auxHeaterStatus_, 0, 2);
+    // has_bitupdate(telegram, auxHeaterStatus_, 0, 2);
     has_update(telegram, auxHeatMixValve_, 7);
 }