diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c
index e3bb25ebff08..09cbb0dbff60 100644
--- a/sys/riscv/riscv/pmap.c
+++ b/sys/riscv/riscv/pmap.c
@@ -804,6 +804,7 @@ pmap_invalidate_all(pmap_t pmap)
 	 * all sfence_vma requests as global however.
 	 */
 	sbi_remote_sfence_vma(mask.__bits, 0, 0);
+	sfence_vma();
 	sched_unpin();
 }
 #else