diff --git a/src/arch/riscv/trap_util.S b/src/arch/riscv/trap_util.S
index 0118ffcfe0..82a5629f4c 100644
--- a/src/arch/riscv/trap_util.S
+++ b/src/arch/riscv/trap_util.S
@@ -124,9 +124,11 @@ trap_entry:
 supervisor_call_return:
   csrr a0, mscratch
   restore_regs
-  eret # go back into supervisor call
+  # go back into supervisor call
+  .word 0x30200073 # mret
   .global machine_call_return
 machine_call_return:
     csrr a0, mscratch
     restore_regs
-    eret # go back into machine call
+    # go back into machine call
+    .word 0x30200073 # mret