diff --git a/arch/arm/core/swap.S b/arch/arm/core/swap.S
index cb7b2e9eb7e..57027862108 100644
--- a/arch/arm/core/swap.S
+++ b/arch/arm/core/swap.S
@@ -179,6 +179,14 @@ _thread_irq_disabled:
     vldmia r0, {s16-s31}
 #endif
 
+#ifdef CONFIG_MPU_STACK_GUARD
+    /* r2 contains k_thread */
+    add r0, r2, #0
+    push {r2, lr}
+    blx configure_mpu_stack_guard
+    pop {r2, lr}
+#endif /* CONFIG_MPU_STACK_GUARD */
+
     /* load callee-saved + psp from thread */
     add r0, r2, #_thread_offset_to_callee_saved
     ldmia r0, {v1-v8, ip}