diff --git a/arch/risc-v/src/mpfs/mpfs_shead.S b/arch/risc-v/src/mpfs/mpfs_shead.S
index 508025ff31..9c124c4011 100644
--- a/arch/risc-v/src/mpfs/mpfs_shead.S
+++ b/arch/risc-v/src/mpfs/mpfs_shead.S
@@ -84,6 +84,11 @@ __start:
   la  gp, __global_pointer$
 .option pop
 
+  /* Remove MMU mappings (if any) and flush TLB */
+
+  csrw satp, zero
+  sfence.vma x0, x0
+
   /* Make sure the writes to CSR stick before continuing */
 
   fence