diff --git a/components/freertos/port/esp8266/panic.c b/components/freertos/port/esp8266/panic.c
index 6c505174..7b2dc39e 100644
--- a/components/freertos/port/esp8266/panic.c
+++ b/components/freertos/port/esp8266/panic.c
@@ -150,7 +150,6 @@ static void panic_info(void *frame, int wdt)
 
     if (wdt) {
         panic_str("Task watchdog got triggered.\r\n\r\n");
-        show_critical_info();
     }
     
     if (_chip_nmi_cnt) {
@@ -161,7 +160,7 @@ static void panic_info(void *frame, int wdt)
 
         panic_stack(&_chip_nmi_stk, &LoadStoreErrorHandlerStack);
     } else {
-        if (xPortInIsrContext()) {
+        if (xPortInIsrContext() && !wdt) {
             extern StackType_t _chip_interrupt_stk, _chip_interrupt_tmp;
 
             panic_str("Core 0 was running in ISR context:\r\n\r\n");