diff --git a/libraries/MySensors/core/MySensorCore.h b/libraries/MySensors/core/MySensorCore.h
index 120dc3c..4d2c92e 100644
--- a/libraries/MySensors/core/MySensorCore.h
+++ b/libraries/MySensors/core/MySensorCore.h
@@ -248,7 +248,7 @@ static inline MyMessage& build(MyMessage &msg, uint8_t sender, uint8_t destinati
 static inline MyMessage& buildGw(MyMessage &msg, uint8_t type) {
 	msg.sender = GATEWAY_ADDRESS;
 	msg.destination = GATEWAY_ADDRESS;
-	msg.sensor = 0;
+	msg.sensor = 255;
 	msg.type = type;
 	mSetCommand(msg, C_INTERNAL);
 	mSetRequestAck(msg, false);