diff --git a/cores/esp8266/HardwareSerial.cpp b/cores/esp8266/HardwareSerial.cpp
index ad8766444..9bd3e35a8 100644
--- a/cores/esp8266/HardwareSerial.cpp
+++ b/cores/esp8266/HardwareSerial.cpp
@@ -510,6 +510,9 @@ void ICACHE_FLASH_ATTR HardwareSerial::begin(unsigned long baud, byte config) {
 }
 
 void ICACHE_FLASH_ATTR HardwareSerial::end() {
+    if(uart_get_debug() == _uart_nr) {
+        uart_set_debug(UART_NO);
+    }
     uart_uninit(_uart);
     delete _rx_buffer;
     delete _tx_buffer;