diff --git a/make/family/ESP8266.make b/make/family/ESP8266.make
index 0a970825e..3e765664e 100644
--- a/make/family/ESP8266.make
+++ b/make/family/ESP8266.make
@@ -96,10 +96,13 @@ SOURCES += targets/esp8266/uart.c \
 	targets/esp8266/jshardware.c \
 	targets/esp8266/i2c_master.c \
 	targets/esp8266/esp8266_board_utils.c \
-	targets/esp8266/gdbstub.c \
-	targets/esp8266/gdbstub-entry.S \
 	libs/network/esp8266/network_esp8266.c
 
+ifdef DEBUG
+SOURCES += 	targets/esp8266/gdbstub.c \
+	targets/esp8266/gdbstub-entry.S 
+endif
+
 # The tool used for building the firmware and flashing
 ESPTOOL    ?= $(ESP8266_SDK_ROOT)/esptool/esptool.py
 
diff --git a/targets/esp8266/user_main.c b/targets/esp8266/user_main.c
index dedcb9d99..c73c6d060 100644
--- a/targets/esp8266/user_main.c
+++ b/targets/esp8266/user_main.c
@@ -241,8 +241,10 @@ static void initDone() {
   os_printf("> initDone\n");
   otaInit(88);
 
-  extern void gdbstub_init();
-  gdbstub_init();
+#ifdef DEBUG
+   extern void gdbstub_init();
+   gdbstub_init();
+#endif
 
   // Discard any junk data in the input as this is a boot.
   //uart_rx_discard();