diff --git a/src/devices/mixing.cpp b/src/devices/mixing.cpp
index 49ffff4f6..9d1d0288a 100644
--- a/src/devices/mixing.cpp
+++ b/src/devices/mixing.cpp
@@ -239,7 +239,7 @@ bool Mixing::export_values(uint8_t mqtt_format, JsonObject & output) {
         }
     } else {
         snprintf_P(hc_name, sizeof(hc_name), PSTR("wwc%d"), hc_);
-        if (mqtt_format == Mqtt::Format::NESTED) {
+        if (mqtt_format == Mqtt::Format::NESTED || mqtt_format == Mqtt::Format::HA) {
             output_hc = output.createNestedObject(hc_name);
         } else {
             output_hc      = output;