diff --git a/lib/async-mqtt-client/src/AsyncMqttClient.cpp b/lib/async-mqtt-client/src/AsyncMqttClient.cpp
index a44c75792..bec082cb5 100644
--- a/lib/async-mqtt-client/src/AsyncMqttClient.cpp
+++ b/lib/async-mqtt-client/src/AsyncMqttClient.cpp
@@ -40,7 +40,7 @@ AsyncMqttClient::AsyncMqttClient()
     _client.onPoll([](void * obj, AsyncClient * c) { (static_cast<AsyncMqttClient *>(obj))->_onPoll(c); }, this);
 
 #ifdef ESP32
-    sprintf(_generatedClientId, "esp32%06x", ESP.getEfuseMac());
+    sprintf(_generatedClientId, "esp32%06x", (int)ESP.getEfuseMac());
     _xSemaphore = xSemaphoreCreateMutex();
 #elif defined(ESP8266)
     sprintf(_generatedClientId, "esp8266%06x", ESP.getChipId());
@@ -931,7 +931,7 @@ uint16_t AsyncMqttClient::unsubscribe(const char * topic) {
 
 uint16_t AsyncMqttClient::publish(const char * topic, uint8_t qos, bool retain, const char * payload, size_t length, bool dup, uint16_t message_id) {
     if (!_connected)
-        return 0; 
+        return 0;
 
     char fixedHeader[5];
     fixedHeader[0] = AsyncMqttClientInternals::PacketType.PUBLISH;
diff --git a/src/mqtt.cpp b/src/mqtt.cpp
index 252dc255f..252620780 100644
--- a/src/mqtt.cpp
+++ b/src/mqtt.cpp
@@ -796,9 +796,9 @@ void Mqtt::register_mqtt_ha_sensor(const char *                prefix,
     // name
     char new_name[50];
     if (prefix != nullptr) {
-        snprintf_P(new_name, sizeof(new_name), PSTR("%s %s %s"), device_name.c_str(), prefix, name);
+        snprintf_P(new_name, sizeof(new_name), PSTR("%s %s %s"), device_name.c_str(), prefix, uuid::read_flash_string(name).c_str());
     } else {
-        snprintf_P(new_name, sizeof(new_name), PSTR("%s %s"), device_name.c_str(), name);
+        snprintf_P(new_name, sizeof(new_name), PSTR("%s %s"), device_name.c_str(), uuid::read_flash_string(name).c_str());
     }
     new_name[0] = toupper(new_name[0]); // capitalize first letter