diff --git a/src/emsesp.cpp b/src/emsesp.cpp
index 99435ee5a..0c38f8c76 100644
--- a/src/emsesp.cpp
+++ b/src/emsesp.cpp
@@ -349,6 +349,7 @@ void EMSESP::show_sensor_values(uuid::console::Shell & shell) {
 void EMSESP::publish_all(bool force) {
     if (force) {
         publish_all_idx_ = 1;
+        reset_mqtt_ha();
         return;
     }
     if (Mqtt::connected()) {
@@ -388,7 +389,7 @@ void EMSESP::publish_all_loop() {
         publish_other_values();
         break;
     case 6:
-        publish_sensor_values(true);
+        publish_sensor_values(true, true);
         break;
     case 7:
         system_.send_heartbeat();