diff --git a/components/xtensa/linker.lf b/components/xtensa/linker.lf
index 2d9d446097..5227ce02df 100644
--- a/components/xtensa/linker.lf
+++ b/components/xtensa/linker.lf
@@ -2,6 +2,7 @@
 archive: libxtensa.a
 entries:
     eri (noflash_text)
+    xtensa_intr_asm (noflash_text)
 
 [mapping:xt_hal]
 archive: libxt_hal.a
diff --git a/components/xtensa/xtensa_intr.c b/components/xtensa/xtensa_intr.c
index becb47a476..be728d0f9e 100644
--- a/components/xtensa/xtensa_intr.c
+++ b/components/xtensa/xtensa_intr.c
@@ -98,7 +98,7 @@ extern xt_handler_table_entry _xt_interrupt_table[XCHAL_NUM_INTERRUPTS*portNUM_P
 /*
   Default handler for unhandled interrupts.
 */
-void xt_unhandled_interrupt(void * arg)
+void IRAM_ATTR xt_unhandled_interrupt(void * arg)
 {
 	esp_rom_printf("Unhandled interrupt %d on cpu %d!\n", (int)arg, xPortGetCoreID());
 }