diff --git a/lib/controller.js b/lib/controller.js
index 1bdab5cf..513ba940 100644
--- a/lib/controller.js
+++ b/lib/controller.js
@@ -161,7 +161,13 @@ class Controller {
             const payload = discover.discovery_payload;
             payload.state_topic = `${settings.get().mqtt.base_topic}/${friendlyName}`;
             payload.availability_topic = `${settings.get().mqtt.base_topic}/bridge/state`;
-            payload.name = friendlyName;
+
+            // Set unique names in cases this device produces multiple entities in homeassistant.
+            if (mappedModel.homeassistant.length > 1) {
+                payload.name = `${friendlyName}_${discover.object_id}`;
+            } else {
+                payload.name = friendlyName;
+            }
 
             if (payload.command_topic) {
                 payload.command_topic = `${settings.get().mqtt.base_topic}/${friendlyName}/set`;