diff --git a/components/bootloader_support/src/bootloader_panic.c b/components/bootloader_support/src/bootloader_panic.c
index 6cff254ce6..aac9e72638 100644
--- a/components/bootloader_support/src/bootloader_panic.c
+++ b/components/bootloader_support/src/bootloader_panic.c
@@ -26,9 +26,11 @@ void abort(void)
 #if !CONFIG_ESP_SYSTEM_PANIC_SILENT_REBOOT
     esp_rom_printf("abort() was called at PC 0x%08x\r\n", (intptr_t)__builtin_return_address(0) - 3);
 #endif
+#if CONFIG_ESP_DEBUG_OCDAWARE
     if (esp_cpu_dbgr_is_attached()) {
         esp_cpu_dbgr_break();
     }
+#endif
     while (1) {
     }
 }
diff --git a/components/esp_system/panic.c b/components/esp_system/panic.c
index c7bcf3d5b5..ca492892e3 100644
--- a/components/esp_system/panic.c
+++ b/components/esp_system/panic.c
@@ -294,6 +294,7 @@ void esp_panic_handler(panic_info_t *info)
     // If on-chip-debugger is attached, and system is configured to be aware of this,
     // then only print up to details. Users should be able to probe for the other information
     // in debug mode.
+#if CONFIG_ESP_DEBUG_OCDAWARE
     if (esp_cpu_dbgr_is_attached()) {
 		char *panic_reason_str = NULL;
 		if (info->pseudo_excause) {
@@ -322,7 +323,7 @@ void esp_panic_handler(panic_info_t *info)
         esp_cpu_set_breakpoint(0, info->addr); // use breakpoint 0
         return;
     }
-
+#endif //CONFIG_ESP_DEBUG_OCDAWARE
     // start panic WDT to restart system if we hang in this handler
     if (!wdt_hal_is_enabled(&rtc_wdt_ctx)) {
         wdt_hal_init(&rtc_wdt_ctx, WDT_RWDT, 0, false);