diff --git a/lib/extension/homeassistant.js b/lib/extension/homeassistant.js
index faab5d6a..8c083ee3 100644
--- a/lib/extension/homeassistant.js
+++ b/lib/extension/homeassistant.js
@@ -454,11 +454,8 @@ class HomeAssistant {
             // Set unique names in cases this device produces multiple entities in homeassistant.
             payload.name = mapping[model].length > 1 ? `${friendlyName}_${config.object_id}` : friendlyName;
 
-            // Only set unique_id when user did not set a friendly_name yet,
-            // see https://github.com/Koenkk/zigbee2mqtt/issues/138
-            if (ieeeAddr === friendlyName) {
-                payload.unique_id = `${ieeeAddr}_${config.object_id}_${settings.get().mqtt.base_topic}`;
-            }
+            // Set unique_id
+            payload.unique_id = `${ieeeAddr}_${config.object_id}_${settings.get().mqtt.base_topic}`;
 
             if (payload.command_topic) {
                 payload.command_topic = `${settings.get().mqtt.base_topic}/${friendlyName}/`;