diff --git a/cores/arduino/trap_handler.c b/cores/arduino/trap_handler.c
index 99a1172..3010ac2 100644
--- a/cores/arduino/trap_handler.c
+++ b/cores/arduino/trap_handler.c
@@ -13,6 +13,10 @@ void __attribute__((weak)) servo_interrupt_handler(void)
 {
     // dummy function for case when servo library is not in use
 }
+void __attribute__((weak)) IRremote_interrupt_handler(void)
+{
+    // dummy function for case when IRremote library is not in use
+}
 
 void __attribute__((weak)) ISR(void)
 {
@@ -46,6 +50,10 @@ void __attribute__((noinline, section(".ram_text"), optimize("O3"))) trap_handle
     if (EPIC_CHECK_GPIO_IRQ())
         gpio_interrupt_handler();
 
+    // IRremote timer interrupt
+    if (EPIC_CHECK_TIMER16_0())
+        IRremote_interrupt_handler();
+
     // tone timer interrupt
     if (EPIC_CHECK_TIMER16_1())
         tone_interrupt_handler();