diff --git a/arch/risc-v/src/common/riscv_fpu.S b/arch/risc-v/src/common/riscv_fpu.S
index 3eae438f592..84989ccbf3a 100644
--- a/arch/risc-v/src/common/riscv_fpu.S
+++ b/arch/risc-v/src/common/riscv_fpu.S
@@ -64,7 +64,11 @@
 riscv_fpuconfig:
     li           a0, MSTATUS_FS_INIT
     csrs         CSR_STATUS, a0
-    csrwi        fcsr, 0
+
+    fsflags      zero
+    fsrm         zero
+
+    fence.i
     ret
 
 #endif /* CONFIG_ARCH_FPU */