diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index 8c083ee32..924018a3d 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -451,8 +451,8 @@ class HomeAssistant {
             payload.state_topic = `${settings.get().mqtt.base_topic}/${friendlyName}`;
             payload.availability_topic = `${settings.get().mqtt.base_topic}/bridge/state`;
 
-            // Set unique names in cases this device produces multiple entities in homeassistant.
-            payload.name = mapping[model].length > 1 ? `${friendlyName}_${config.object_id}` : friendlyName;
+            // Set (unique) name
+            payload.name = `${friendlyName}_${config.object_id}`;
 
             // Set unique_id
             payload.unique_id = `${ieeeAddr}_${config.object_id}_${settings.get().mqtt.base_topic}`;