diff --git a/arch/z80/src/common/z80_doirq.c b/arch/z80/src/common/z80_doirq.c
index 5ee0c89ad15..fad4c7aa4f9 100644
--- a/arch/z80/src/common/z80_doirq.c
+++ b/arch/z80/src/common/z80_doirq.c
@@ -47,6 +47,8 @@ FAR chipreg_t *z80_doirq(uint8_t irq, FAR chipreg_t *regs)
 {
   board_autoled_on(LED_INIRQ);
 
+  DECL_SAVESTATE();
+
 #ifdef CONFIG_SUPPRESS_INTERRUPTS
 
   IRQ_ENTER(regs);
@@ -61,8 +63,6 @@ FAR chipreg_t *z80_doirq(uint8_t irq, FAR chipreg_t *regs)
 
   if (irq < NR_IRQS)
     {
-      DECL_SAVESTATE();
-
       /* Indicate that we have entered IRQ processing logic */
 
       IRQ_ENTER(irq, regs);