diff --git a/main/ZgatewayBT.ino b/main/ZgatewayBT.ino
index d51cb70..f33a0ff 100644
--- a/main/ZgatewayBT.ino
+++ b/main/ZgatewayBT.ino
@@ -843,7 +843,7 @@ void launchBTDiscovery() {
           Log.trace("Name: %s", prop.value()["name"].as<const char*>());
           String discovery_topic = String(subjectBTtoMQTT) + "/" + macWOdots;
           String entity_name = String(model_id.c_str()) + "-" + String(prop.key().c_str());
-          String unique_id = macWOdots + "-" + entity_name;
+          String unique_id = macWOdots + "-" + String(prop.key().c_str());
 #    if OpenHABDiscovery
           String value_template = "{{ value_json." + String(prop.key().c_str()) + "}}";
 #    else
diff --git a/main/ZmqttDiscovery.ino b/main/ZmqttDiscovery.ino
index 1ac221b..d262d6c 100644
--- a/main/ZmqttDiscovery.ino
+++ b/main/ZmqttDiscovery.ino
@@ -43,7 +43,7 @@ String getMacAddress() {
 }
 
 String getUniqueId(String name, String sufix) {
-  String uniqueId = (String)getMacAddress() + name + sufix;
+  String uniqueId = (String)getMacAddress() + "-" + name + sufix;
   return String(uniqueId);
 }