diff --git a/main/ZmqttDiscovery.ino b/main/ZmqttDiscovery.ino
index f38abf0..6671836 100644
--- a/main/ZmqttDiscovery.ino
+++ b/main/ZmqttDiscovery.ino
@@ -551,7 +551,7 @@ void pubMqttDiscovery() {
 #  ifdef ZgatewayRF2
   // Sensor to display RF received value
   Log.trace(F("gatewayRF2Discovery" CR));
-  char* gatewayRF2[8] = {"sensor", "gatewayRF2", "", "", jsonVal, "", "", ""};
+  char* gatewayRF2[8] = {"sensor", "gatewayRF2", "", "", jsonAddress, "", "", ""};
   //component type,name,availability topic,device class,value template,payload on, payload off, unit of measurement
 
   Log.trace(F("CreateDiscoverySensor" CR));
diff --git a/main/config_mqttDiscovery.h b/main/config_mqttDiscovery.h
index dd703dc..34d4b38 100644
--- a/main/config_mqttDiscovery.h
+++ b/main/config_mqttDiscovery.h
@@ -75,6 +75,7 @@ extern void createDiscovery(char* sensor_type,
 #  define jsonAdc      "{{ value_json.adc }}"
 #  define jsonPa       "{{ float(value_json.pa) * 0.01 }}"
 #  define jsonId       "{{ value_json.id }}"
+#  define jsonAddress  "{{ value_json.address }}"
 #else // Home assistant autodiscovery value key definition
 #  define jsonBatt     "{{ value_json.batt | is_defined }}"
 #  define jsonLux      "{{ value_json.lux | is_defined }}"
@@ -103,6 +104,7 @@ extern void createDiscovery(char* sensor_type,
 #  define jsonAdc      "{{ value_json.adc | is_defined }}"
 #  define jsonPa       "{{ float(value_json.pa) * 0.01 | is_defined }}"
 #  define jsonId       "{{ value_json.id | is_defined }}"
+#  define jsonAddress  "{{ value_json.address | is_defined }}"
 #endif
 
 #endif