diff --git a/arch/x86_64/src/intel64/intel64_handlers.c b/arch/x86_64/src/intel64/intel64_handlers.c
index 5b432edf57..87d1e4c74d 100644
--- a/arch/x86_64/src/intel64/intel64_handlers.c
+++ b/arch/x86_64/src/intel64/intel64_handlers.c
@@ -62,8 +62,6 @@
 #ifndef CONFIG_SUPPRESS_INTERRUPTS
 static uint64_t *common_handler(int irq, uint64_t *regs)
 {
-  board_autoled_on(LED_INIRQ);
-
   /* Current regs non-zero indicates that we are processing an interrupt;
    * g_current_regs is also used to manage interrupt level context switches.
    *
@@ -135,9 +133,9 @@ static uint64_t *common_handler(int irq, uint64_t *regs)
 
 uint64_t *isr_handler(uint64_t *regs, uint64_t irq)
 {
-#ifdef CONFIG_SUPPRESS_INTERRUPTS
   board_autoled_on(LED_INIRQ);
 
+#ifdef CONFIG_SUPPRESS_INTERRUPTS
   /* Doesn't return */
 
   PANIC();
@@ -188,7 +186,7 @@ uint64_t *isr_handler(uint64_t *regs, uint64_t irq)
 }
 
 /****************************************************************************
- * Name: isr_handler
+ * Name: irq_handler
  *
  * Description:
  *   This gets called from IRQ vector handling logic in intel64_vectors.S
@@ -197,9 +195,9 @@ uint64_t *isr_handler(uint64_t *regs, uint64_t irq)
 
 uint64_t *irq_handler(uint64_t *regs, uint64_t irq_no)
 {
-#ifdef CONFIG_SUPPRESS_INTERRUPTS
   board_autoled_on(LED_INIRQ);
 
+#ifdef CONFIG_SUPPRESS_INTERRUPTS
   /* Doesn't return */
 
   PANIC();
@@ -211,8 +209,6 @@ uint64_t *irq_handler(uint64_t *regs, uint64_t irq_no)
   uint64_t *ret;
   int irq;
 
-  board_autoled_on(LED_INIRQ);
-
   /* Get the IRQ number */
 
   irq = (int)irq_no;