diff --git a/src/devices/boiler.h b/src/devices/boiler.h
index 0420c2ed7..71776972e 100644
--- a/src/devices/boiler.h
+++ b/src/devices/boiler.h
@@ -204,7 +204,7 @@ class Boiler : public EMSdevice {
     int16_t cylBottomTemp_; // TB3
     int16_t aFlowTemp_;     // TA1
     int16_t aRetTemp_;      // TR1
-    uint8_t aPump_;         // PR1
+    uint8_t aPump_;         // PR1 - percent
     uint8_t valveByPass_;   // VR2
     uint8_t valveBuffer_;   // VB1
     uint8_t valveReturn_;   // VR1
diff --git a/src/emsesp.cpp b/src/emsesp.cpp
index 82a29153f..3e2e60a7b 100644
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -955,9 +955,9 @@ bool EMSESP::add_device(const uint8_t device_id, const uint8_t product_id, const
     for (auto & device : device_library_) {
         if (device.product_id == product_id) {
             // sometimes boilers share the same productID as controllers
-            // so only add boilers if the device_id is 0x08, which is fixed for EMS
+            // so only add boilers if the device_id is 0x08 or 0x60 or 0x70.., which is fixed for EMS
             if (device.device_type == DeviceType::BOILER) {
-                if (device_id == EMSdevice::EMS_DEVICE_ID_BOILER
+                if (device_id == EMSdevice::EMS_DEVICE_ID_BOILER || device_id == EMSdevice::EMS_DEVICE_ID_AM200
                     || (device_id >= EMSdevice::EMS_DEVICE_ID_BOILER_1 && device_id <= EMSdevice::EMS_DEVICE_ID_BOILER_F)) {
                     device_p = &device;
                     break;