diff --git a/libraries/MySensors/MySensor.h b/libraries/MySensors/MySensor.h
index 90ef395..36b8bea 100644
--- a/libraries/MySensors/MySensor.h
+++ b/libraries/MySensors/MySensor.h
@@ -65,10 +65,6 @@
 	//#undef F
 	//#define F(x) (x)
 	#include "core/MyHwESP8266.cpp"
-	// Enable gateway feature
-	#if !defined(MY_CORE_ONLY)
-		#define MY_GATEWAY_ESP8266
-	#endif
 #elif defined(ARDUINO_ARCH_AVR)
 	#include "core/MyHwATMega328.cpp"
 #elif defined(ARDUINO_ARCH_SAMD)
diff --git a/libraries/MySensors/examples/GatewayESP8266/GatewayESP8266.ino b/libraries/MySensors/examples/GatewayESP8266/GatewayESP8266.ino
index d85bd79..803eb7d 100644
--- a/libraries/MySensors/examples/GatewayESP8266/GatewayESP8266.ino
+++ b/libraries/MySensors/examples/GatewayESP8266/GatewayESP8266.ino
@@ -78,7 +78,6 @@
 #define MY_RADIO_NRF24
 //#define MY_RADIO_RFM69
 
-// Gateway mode always enabled for ESP8266. But we add this anyway ;)
 #define MY_GATEWAY_ESP8266
 
 #define MY_ESP8266_SSID "MySSID"
diff --git a/libraries/MySensors/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino b/libraries/MySensors/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino
index 4aeb228..60d052e 100644
--- a/libraries/MySensors/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino
+++ b/libraries/MySensors/examples/GatewayESP8266MQTTClient/GatewayESP8266MQTTClient.ino
@@ -71,6 +71,7 @@
 //#define MY_RADIO_RFM69
 
 #define MY_GATEWAY_MQTT_CLIENT
+#define MY_GATEWAY_ESP8266
 
 // Set this nodes subscripe and publish topic prefix
 #define MY_MQTT_PUBLISH_TOPIC_PREFIX "mygateway1-out"