diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index 1205dd030..c62abd989 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -918,7 +918,7 @@ bool Mqtt::publish_ha_sensor_config(uint8_t               type,        // EMSdev
             if (EMSESP::system_.enum_format() == ENUM_FORMAT_INDEX) {
                 // use index numbers
                 for (uint8_t i = 0; i < options_size; i++) {
-                    option_list.add(i);
+                    option_list.add(Helpers::itoa(i)); // as a string
                 }
                 snprintf(sample_val, sizeof(sample_val), "0");
             } else {