diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md
index 9adde9275..e091e1ece 100644
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -11,6 +11,7 @@ For more details go to [emsesp.org](https://emsesp.org/).
 - set model for ems-esp devices temperature, analog, etc. [#2958](https://github.com/emsesp/EMS-ESP32/discussions/2958)
 - prometheus metrics for temperature/analog/scheduler/custom [#2962](https://github.com/emsesp/EMS-ESP32/issues/2962)
 - boiler pumpkick [#2965](https://github.com/emsesp/EMS-ESP32/discussions/2965)
+- heatpump reset [#2933](https://github.com/emsesp/EMS-ESP32/issues/2933)
 
 ## Fixed
 
diff --git a/src/core/locale_common.h b/src/core/locale_common.h
index 2b9222f69..2b769dd2c 100644
--- a/src/core/locale_common.h
+++ b/src/core/locale_common.h
@@ -303,7 +303,7 @@ MAKE_ENUM(enum_comfort, FL_(hot), FL_(eco), FL_(intelligent))
 MAKE_ENUM(enum_comfort1, FL_(high_comfort), FL_(eco))
 MAKE_ENUM(enum_comfort2, FL_(eco), FL_(high_comfort))
 MAKE_ENUM(enum_flow, FL_(off), FL_(flow), FL_(bufferedflow), FL_(buffer), FL_(layeredbuffer))
-MAKE_ENUM(enum_reset, FL_(dash), FL_(maintenance), FL_(error), FL_(history), FL_(message))
+MAKE_ENUM(enum_reset, FL_(dash), FL_(maintenance), FL_(error), FL_(history), FL_(message), FL_(hp_error), FL_(burn_starts), FL_(factory))
 MAKE_ENUM(enum_maxHeat, FL_(0kW), FL_(2kW), FL_(3kW), FL_(4kW), FL_(6kW), FL_(9kW))
 MAKE_ENUM(enum_maxHeat1, FL_(0kW), FL_(3kW), FL_(6kW), FL_(9kW))
 MAKE_ENUM(enum_maxHeat2, FL_(3kW), FL_(6kW), FL_(9kW))
diff --git a/src/core/locale_translations.h b/src/core/locale_translations.h
index faf364abc..4911aceb4 100644
--- a/src/core/locale_translations.h
+++ b/src/core/locale_translations.h
@@ -197,6 +197,9 @@ MAKE_WORD_TRANSLATION(lower, "lower", "niedriger", "lager", "lägre", "mniejszy"
 MAKE_WORD_TRANSLATION(error, "error", "Fehler", "error", "Fel", "błąd", "feil", "erreur", "Hata", "errore", "error", "chyba")
 MAKE_WORD_TRANSLATION(history, "history", "Fehlerspeicher", "geschiedenis", "historik", "historia", "historikk", "historique", "geçmiş", "storico", "história", "historie")
 MAKE_WORD_TRANSLATION(message, "message", "Meldung", "melding", "meddelande", "komunikat", "melding", "message", "mesajı", "messaggio", "správa", "zpráva")
+MAKE_WORD_TRANSLATION(hp_error, "hp error", "WP Fehler", "hp error", "hp Fel", "hp błąd", "hp feil", "hp erreur", "hp Hata", "hp errore", "hp error", "hp chyba")
+MAKE_WORD_TRANSLATION(factory, "factory", "werkseinst.", "", "", "", "", "", "", "", "", "")
+MAKE_WORD_TRANSLATION(burn_starts, "burner starts", "Brennerstarts", "", "", "", "", "", "", "", "", "")
 MAKE_WORD_TRANSLATION(na, "n/a", "n/a", "n/a", "n/a", "nd.", "n/a", "n/c", "mevcut değil", "n/a", "n/a", "n/a")
 MAKE_WORD_TRANSLATION(inverted, "inverted", "invertiert", "omgekeerd", "inverterad", "odwrócony", "invertert", "inversé", "ters", "invertito", "invertovaný", "invertovaný")
 
diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp
index 94cc96969..0f8e60970 100644
--- a/src/devices/boiler.cpp
+++ b/src/devices/boiler.cpp
@@ -3005,25 +3005,26 @@ bool Boiler::set_reset(const char * value, const int8_t id) {
     }
 
     if (num == 0) {
-        return true; // dash
-    } else if (num == 1) {
-        // LOG_INFO("Reset boiler maintenance message");
+        return true;       // dash
+    } else if (num == 1) { // Reset boiler maintenance message;
         write_command(0x05, 8, 0xFF, 0x1C);
         return true;
-    } else if (num == 2) {
-        // LOG_INFO("Reset boiler error message");
-        write_command(0x05, 0, 0x5A); // error reset
+    } else if (num == 2) { // Reset boiler error message;
+        write_command(0x05, 0, 0x5A);
         return true;
-    } else if (num == 3) {
-        // LOG_INFO("Reset boiler history");
-        write_command(0x05, 42, 0x01); // clear history
+    } else if (num == 3) { // Reset boiler history
+        write_command(0x05, 42, 0x01);
         return true;
     } else if (num == 4) {
-        // LOG_INFO("Reset boiler message");
-        write_command(0x05, 8, 0xFF); // same as maintenance
+        write_command(0x05, 8, 0xFF); // reset messages, same as maintenance reset (1)
         return true;
-    } else if (num == 5) {
-        // LOG_INFO("Factory Reset");
+    } else if (num == 5) { // reset Heatpump errors
+        write_command(0x05, 50, 0xFF);
+        return true;
+    } else if (num == 6) { // reset burner starts
+        write_command(0x05, 2, 165);
+        return true;
+    } else if (num == 7) { // factory reset
         write_command(0x05, 6, 154);
         return true;
     }
diff --git a/src/emsesp_version.h b/src/emsesp_version.h
index 5ac15a43a..4d8361cf0 100644
--- a/src/emsesp_version.h
+++ b/src/emsesp_version.h
@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.8.2-dev.8"
+#define EMSESP_APP_VERSION "3.8.2-dev.9"