diff --git a/dirigera-client-mqtt/src/main/java/de/dvdgeisler/iot/dirigera/client/mqtt/hass/HassDeviceEventHandler.java b/dirigera-client-mqtt/src/main/java/de/dvdgeisler/iot/dirigera/client/mqtt/hass/HassDeviceEventHandler.java
index 722a35c..955a666 100644
--- a/dirigera-client-mqtt/src/main/java/de/dvdgeisler/iot/dirigera/client/mqtt/hass/HassDeviceEventHandler.java
+++ b/dirigera-client-mqtt/src/main/java/de/dvdgeisler/iot/dirigera/client/mqtt/hass/HassDeviceEventHandler.java
@@ -68,7 +68,9 @@ public static <D extends Device> String getDefaultName(final D device) {
                         .map(d->d.attributes)
                         .map(a->a.model)
                         .filter(n -> !n.isBlank())
-                        .orElse(device.id));
+                        // MQTT entities aren't allowed to have the same Device ID as Entity ID in HASS from version 2024.2.0
+                        // As a fallback to not having a custom name set, we add 'dirigera_' in front of the device ID
+                        .orElse(String.format("%s_%s", "dirigera_", device.id)));
     }
 
     public de.dvdgeisler.iot.dirigera.client.mqtt.hass.model.Device getDeviceConfig(final D device) {