diff --git a/lib/homeassistant.js b/lib/homeassistant.js
index 18486568..d9c70b4c 100644
--- a/lib/homeassistant.js
+++ b/lib/homeassistant.js
@@ -305,7 +305,12 @@ function discover(deviceID, model, mqtt, force) {
 
         // Set unique names in cases this device produces multiple entities in homeassistant.
         payload.name = mapping[model].length > 1 ? `${friendlyName}_${config.object_id}` : friendlyName;
-        payload.unique_id = `${deviceID}_${config.object_id}_${settings.get().mqtt.base_topic}`;
+
+        // Only set unique_id when user did not set a friendly_name yet,
+        // see https://github.com/Koenkk/zigbee2mqtt/issues/138
+        if (deviceID === friendlyName) {
+            payload.unique_id = `${deviceID}_${config.object_id}_${settings.get().mqtt.base_topic}`;
+        }
 
         if (payload.command_topic) {
             payload.command_topic = `${settings.get().mqtt.base_topic}/${friendlyName}/`;