diff --git a/arch/risc-v/src/rv32im/riscv_copystate.c b/arch/risc-v/src/rv32im/riscv_copystate.c
index 08fc9534bf..c4311a5c80 100644
--- a/arch/risc-v/src/rv32im/riscv_copystate.c
+++ b/arch/risc-v/src/rv32im/riscv_copystate.c
@@ -81,5 +81,9 @@ void up_copystate(uint32_t *dest, uint32_t *src)
         {
           *dest++ = *src++;
         }
+
+#ifdef CONFIG_ARCH_FPU
+      up_savefpu(dest);
+#endif
     }
 }