diff --git a/arch/arm/src/imxrt/imxrt_irq.c b/arch/arm/src/imxrt/imxrt_irq.c
index 5b16fbb546..3104b8b6ca 100644
--- a/arch/arm/src/imxrt/imxrt_irq.c
+++ b/arch/arm/src/imxrt/imxrt_irq.c
@@ -406,11 +406,11 @@ void up_irqinitialize(void)
    * registers.
    */
 
-  for (i = nintlines, regaddr = NVIC_IRQ0_31_ENABLE;
+  for (i = nintlines, regaddr = NVIC_IRQ0_31_CLEAR;
        i > 0;
        i--, regaddr += 4)
     {
-      putreg32(0, regaddr);
+      putreg32(0xffffffff, regaddr);
     }
 
   /* Make sure that we are using the correct vector table.  The default
diff --git a/arch/arm/src/kinetis/kinetis_irq.c b/arch/arm/src/kinetis/kinetis_irq.c
index c3aa3dc775..c5ed375508 100644
--- a/arch/arm/src/kinetis/kinetis_irq.c
+++ b/arch/arm/src/kinetis/kinetis_irq.c
@@ -347,11 +347,11 @@ void up_irqinitialize(void)
    * registers.
    */
 
-  for (i = nintlines, regaddr = NVIC_IRQ0_31_ENABLE;
+  for (i = nintlines, regaddr = NVIC_IRQ0_31_CLEAR;
        i > 0;
        i--, regaddr += 4)
     {
-      putreg32(0, regaddr);
+      putreg32(0xffffffff, regaddr);
     }
 
   /* Make sure that we are using the correct vector table.  The default
diff --git a/arch/arm/src/lc823450/lc823450_irq.c b/arch/arm/src/lc823450/lc823450_irq.c
index 947fae28b4..7faf0bded8 100644
--- a/arch/arm/src/lc823450/lc823450_irq.c
+++ b/arch/arm/src/lc823450/lc823450_irq.c
@@ -467,8 +467,8 @@ void up_irqinitialize(void)
 
   /* Disable all interrupts */
 
-  putreg32(0, NVIC_IRQ0_31_ENABLE);
-  putreg32(0, NVIC_IRQ32_63_ENABLE);
+  putreg32(0xffffffff, NVIC_IRQ0_31_CLEAR);
+  putreg32(0xffffffff, NVIC_IRQ32_63_CLEAR);
 
   /* Colorize the interrupt stack for debug purposes */
 
diff --git a/arch/arm/src/lpc17xx/lpc17_irq.c b/arch/arm/src/lpc17xx/lpc17_irq.c
index 01475fe572..ba94de4377 100644
--- a/arch/arm/src/lpc17xx/lpc17_irq.c
+++ b/arch/arm/src/lpc17xx/lpc17_irq.c
@@ -316,11 +316,11 @@ void up_irqinitialize(void)
    * registers.
    */
 
-  for (i = nintlines, regaddr = NVIC_IRQ0_31_ENABLE;
+  for (i = nintlines, regaddr = NVIC_IRQ0_31_CLEAR;
        i > 0;
        i--, regaddr += 4)
     {
-      putreg32(0, regaddr);
+      putreg32(0xffffffff, regaddr);
     }
 
   /* Make sure that we are using the correct vector table.  The default
diff --git a/arch/arm/src/sam34/sam_irq.c b/arch/arm/src/sam34/sam_irq.c
index 24d08cff92..7200d028f7 100644
--- a/arch/arm/src/sam34/sam_irq.c
+++ b/arch/arm/src/sam34/sam_irq.c
@@ -378,11 +378,11 @@ void up_irqinitialize(void)
    * registers.
    */
 
-  for (i = nintlines, regaddr = NVIC_IRQ0_31_ENABLE;
+  for (i = nintlines, regaddr = NVIC_IRQ0_31_CLEAR;
        i > 0;
        i--, regaddr += 4)
     {
-      putreg32(0, regaddr);
+      putreg32(0xffffffff, regaddr);
     }
 
   /* Make sure that we are using the correct vector table.  The default
diff --git a/arch/arm/src/samd5e5/sam_irq.c b/arch/arm/src/samd5e5/sam_irq.c
index 1a966b1c54..0d40eccd28 100644
--- a/arch/arm/src/samd5e5/sam_irq.c
+++ b/arch/arm/src/samd5e5/sam_irq.c
@@ -456,11 +456,11 @@ void up_irqinitialize(void)
    * registers.
    */
 
-  for (i = nintlines, regaddr = NVIC_IRQ0_31_ENABLE;
+  for (i = nintlines, regaddr = NVIC_IRQ0_31_CLEAR;
        i > 0;
        i--, regaddr += 4)
     {
-      putreg32(0, regaddr);
+      putreg32(0xffffffff, regaddr);
     }
 
   /* Make sure that we are using the correct vector table.  The default
diff --git a/arch/arm/src/samv7/sam_irq.c b/arch/arm/src/samv7/sam_irq.c
index 15910d24d6..99bdd54fd5 100644
--- a/arch/arm/src/samv7/sam_irq.c
+++ b/arch/arm/src/samv7/sam_irq.c
@@ -374,11 +374,11 @@ void up_irqinitialize(void)
    * registers.
    */
 
-  for (i = nintlines, regaddr = NVIC_IRQ0_31_ENABLE;
+  for (i = nintlines, regaddr = NVIC_IRQ0_31_CLEAR;
        i > 0;
        i--, regaddr += 4)
     {
-      putreg32(0, regaddr);
+      putreg32(0xffffffff, regaddr);
     }
 
   /* Make sure that we are using the correct vector table.  The default
diff --git a/arch/arm/src/stm32f7/stm32_irq.c b/arch/arm/src/stm32f7/stm32_irq.c
index b0f9c41ab0..1926774006 100644
--- a/arch/arm/src/stm32f7/stm32_irq.c
+++ b/arch/arm/src/stm32f7/stm32_irq.c
@@ -408,11 +408,11 @@ void up_irqinitialize(void)
    * registers.
    */
 
-  for (i = nintlines, regaddr = NVIC_IRQ0_31_ENABLE;
+  for (i = nintlines, regaddr = NVIC_IRQ0_31_CLEAR;
        i > 0;
        i--, regaddr += 4)
     {
-      putreg32(0, regaddr);
+      putreg32(0xffffffff, regaddr);
     }
 
   /* Make sure that we are using the correct vector table.  The default
diff --git a/arch/arm/src/stm32h7/stm32_irq.c b/arch/arm/src/stm32h7/stm32_irq.c
index 02c5e46e6b..d008e778fd 100644
--- a/arch/arm/src/stm32h7/stm32_irq.c
+++ b/arch/arm/src/stm32h7/stm32_irq.c
@@ -433,11 +433,11 @@ void up_irqinitialize(void)
    * registers.
    */
 
-  for (i = nintlines, regaddr = NVIC_IRQ0_31_ENABLE;
+  for (i = nintlines, regaddr = NVIC_IRQ0_31_CLEAR;
        i > 0;
        i--, regaddr += 4)
     {
-      putreg32(0, regaddr);
+      putreg32(0xffffffff, regaddr);
     }
 
   /* Make sure that we are using the correct vector table.  The default
diff --git a/arch/arm/src/tiva/tiva_irq.c b/arch/arm/src/tiva/tiva_irq.c
index 323316c630..4ca58a200b 100644
--- a/arch/arm/src/tiva/tiva_irq.c
+++ b/arch/arm/src/tiva/tiva_irq.c
@@ -386,11 +386,11 @@ void up_irqinitialize(void)
    * registers.
    */
 
-  for (i = nintlines, regaddr = NVIC_IRQ0_31_ENABLE;
+  for (i = nintlines, regaddr = NVIC_IRQ0_31_CLEAR;
        i > 0;
        i--, regaddr += 4)
     {
-      putreg32(0, regaddr);
+      putreg32(0xffffffff, regaddr);
     }
 
   /* Make sure that we are using the correct vector table.  The default
diff --git a/arch/arm/src/xmc4/xmc4_irq.c b/arch/arm/src/xmc4/xmc4_irq.c
index 20bc989c45..b701f64f18 100644
--- a/arch/arm/src/xmc4/xmc4_irq.c
+++ b/arch/arm/src/xmc4/xmc4_irq.c
@@ -347,11 +347,11 @@ void up_irqinitialize(void)
    * registers.
    */
 
-  for (i = nintlines, regaddr = NVIC_IRQ0_31_ENABLE;
+  for (i = nintlines, regaddr = NVIC_IRQ0_31_CLEAR;
        i > 0;
        i--, regaddr += 4)
     {
-      putreg32(0, regaddr);
+      putreg32(0xffffffff, regaddr);
     }
 
   /* Make sure that we are using the correct vector table.  The default