diff --git a/docs/use/ble.md b/docs/use/ble.md
index cb475674..307d711d 100644
--- a/docs/use/ble.md
+++ b/docs/use/ble.md
@@ -79,7 +79,7 @@ Note that you can find apps to simulate beacons and do some tests like [Beacon s
 iOS version >=10 devices advertise without an extra app MAC address, nevertheless this address [changes randomly](https://github.com/1technophile/OpenMQTTGateway/issues/71) and cannot be used for presence detection. You must install an app to advertise a fixed MAC address.
 
 ::: info
-The `presenceawaytimer` is also used to reset the state of the PIR/motion sensors to `off` when using HA MQTT discovery convention. If the Sensor does not detect a motion, its state will be automatically set to `off` after the `presenceawaytimer`.
+The `presenceawaytimer` is also used to reset the state of the binary sensors, PIR/motion sensors to `off` when using HA MQTT discovery convention. If the Sensor does not detect a motion, its state will be automatically set to `off` after the `presenceawaytimer`.
 :::
 
 ## Receiving signals from BLE devices with accelerometers for movement detection
diff --git a/main/ZgatewayBT.ino b/main/ZgatewayBT.ino
index e3e057c9..c9243eed 100644
--- a/main/ZgatewayBT.ino
+++ b/main/ZgatewayBT.ino
@@ -1054,7 +1054,7 @@ void launchBTDiscovery(bool overrideDiscovery) {
                                 discovery_topic.c_str(), entity_name.c_str(), unique_id.c_str(),
                                 will_Topic, prop.value()["name"], value_template.c_str(),
                                 "True", "False", "",
-                                0, "", "", false, "",
+                                BTConfig.presenceAwayTimer, "", "", false, "",
                                 model.c_str(), brand.c_str(), model_id.c_str(), macWOdots.c_str(), false,
                                 stateClassNone);
               } else if (strcmp(prop.key().c_str(), "device") != 0 && strcmp(prop.key().c_str(), "mac") != 0) { // Exception on device and mac as these ones are not sensors