diff --git a/libraries/MySensors/MyRFDriverRF69.cpp b/libraries/MySensors/MyRFDriverRF69.cpp
index 57b9f8d..80e8874 100644
--- a/libraries/MySensors/MyRFDriverRF69.cpp
+++ b/libraries/MySensors/MyRFDriverRF69.cpp
@@ -30,6 +30,10 @@ bool MyRFDriverRF69::send(uint8_t to, const void* data, uint8_t len) {
 }
 
 bool MyRFDriverRF69::available(uint8_t *to) {
+	if (radio->TARGETID == BROADCAST_ADDRESS)
+		*to = BROADCAST_ADDRESS;
+	else
+		*to = _address;
 	return radio->receiveDone();
 }