diff --git a/arch/risc-v/src/mpfs/mpfs_head.S b/arch/risc-v/src/mpfs/mpfs_head.S
index 465cf1f0f60..50dd2709226 100644
--- a/arch/risc-v/src/mpfs/mpfs_head.S
+++ b/arch/risc-v/src/mpfs/mpfs_head.S
@@ -129,6 +129,10 @@ __start:
 .option pop
 
 #ifdef CONFIG_MPFS_BOOTLOADER
+  /* Clear PMP */
+
+  csrw pmpcfg0, zero
+  csrw pmpcfg2, zero
 
   /* Set all but the boot hart into wfi */
 
@@ -175,11 +179,6 @@ __start:
   sd   x0, 0(a4)
   add  a4, a4, 8
   blt  a4, a5, .clear_l2lim
-
-  /* Clear PMP */
-
-  csrw pmpcfg0, zero
-  csrw pmpcfg2, zero
 #endif
 
   /* Set stack pointer to the idle thread stack */