diff --git a/libraries/Zigbee/src/ZigbeeCore.cpp b/libraries/Zigbee/src/ZigbeeCore.cpp
index b60afdc0e..cc0111f26 100644
--- a/libraries/Zigbee/src/ZigbeeCore.cpp
+++ b/libraries/Zigbee/src/ZigbeeCore.cpp
@@ -99,7 +99,7 @@ static void esp_zb_task(void *pvParameters) {
 
   //NOTE: This is a workaround to make battery powered devices to be discovered as battery powered
   if (((zigbee_role_t)Zigbee.getRole() == ZIGBEE_END_DEVICE) && edBatteryPowered) {
-    zb_set_ed_node_descriptor(0, _rx_on_when_idle, 1);
+    zb_set_ed_node_descriptor(0, Zigbee.getRxOnWhenIdle(), 1);
   }
 
   esp_zb_stack_main_loop();
diff --git a/libraries/Zigbee/src/ZigbeeCore.h b/libraries/Zigbee/src/ZigbeeCore.h
index ba0be2eaa..c72a60d81 100644
--- a/libraries/Zigbee/src/ZigbeeCore.h
+++ b/libraries/Zigbee/src/ZigbeeCore.h
@@ -122,6 +122,9 @@ public:
   void setRxOnWhenIdle(bool rx_on_when_idle) {
     _rx_on_when_idle = rx_on_when_idle;
   }
+  bool getRxOnWhenIdle() {
+    return _rx_on_when_idle;
+  }
 
   void setRebootOpenNetwork(uint8_t time);
   void openNetwork(uint8_t time);