diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp
index d1ff1e34c..3153f94b1 100644
--- a/src/emsdevice.cpp
+++ b/src/emsdevice.cpp
@@ -155,6 +155,9 @@ const char * EMSdevice::device_type_2_device_name(const uint8_t device_type) {
 const char * EMSdevice::device_type_2_device_name_translated() {
     switch (device_type_) {
     case DeviceType::BOILER:
+        if (flags_ == EMS_DEVICE_FLAG_HEATPUMP) {
+            return Helpers::translated_word(FL_(boiler_hp_device));
+        }
         return Helpers::translated_word(FL_(boiler_device));
     case DeviceType::THERMOSTAT:
         return Helpers::translated_word(FL_(thermostat_device));
diff --git a/src/locale_translations.h b/src/locale_translations.h
index ca1d8790e..6ee851ee6 100644
--- a/src/locale_translations.h
+++ b/src/locale_translations.h
@@ -36,6 +36,7 @@
 // if there is no translation, it will default to en
 //
 // device types, as display in Web and Console
+MAKE_WORD_TRANSLATION(boiler_hp_device, "Boiler/HP", "Kessel/WP", "CV ketel/WP", "Värmepanna/VP", "Kocioł/PC", "Varmekjele/VP", "", "Kazan/IP", "Caldaia/PC", "Bojler/Tč") // TODO translate
 MAKE_WORD_TRANSLATION(boiler_device, "Boiler", "Kessel", "CV ketel", "Värmepanna", "Kocioł", "Varmekjele", "", "Kazan", "Caldaia", "Bojler") // TODO translate
 MAKE_WORD_TRANSLATION(thermostat_device, "Thermostat", "Thermostat", "Thermostaat", "Termostat", "Termostat", "Termostat", "", "Termostat", "Termostato", "Termostat") // TODO translate
 MAKE_WORD_TRANSLATION(heatpump_device, "Heat Pump", "Wärmepumpe", "Warmtepomp", "Värmepump", "Pompa ciepła", "Varmepumpe", "", "Isı Pompası", "Pompa di Calore", "Tepelné čerpadlo") // TODO translate