diff --git a/arch/arm/src/arm/up_dataabort.c b/arch/arm/src/arm/up_dataabort.c
index 49eb5b6a692..05886e38491 100644
--- a/arch/arm/src/arm/up_dataabort.c
+++ b/arch/arm/src/arm/up_dataabort.c
@@ -161,6 +161,10 @@ void up_dataabort(uint32_t *regs, uint32_t far, uint32_t fsr)
    */
 
   pg_miss();
+
+  /* Indicate that we are no longer in an interrupt handler */
+
+  current_regs = NULL;
   return;
 
 segfault:
diff --git a/arch/arm/src/arm/up_prefetchabort.c b/arch/arm/src/arm/up_prefetchabort.c
index ea70a2ff579..2d184bad668 100644
--- a/arch/arm/src/arm/up_prefetchabort.c
+++ b/arch/arm/src/arm/up_prefetchabort.c
@@ -132,6 +132,10 @@ void up_prefetchabort(uint32_t *regs)
        */
 
       pg_miss();
+
+      /* Indicate that we are no longer in an interrupt handler */
+
+      current_regs = NULL;
     }
   else
 #endif