diff --git a/src/arch/riscv/api/faults.c b/src/arch/riscv/api/faults.c
index 5f95a8b18..d14b2a87c 100644
--- a/src/arch/riscv/api/faults.c
+++ b/src/arch/riscv/api/faults.c
@@ -33,10 +33,10 @@ word_t Arch_setMRs_fault(tcb_t *sender, tcb_t *receiver, word_t *receiveIPCBuffe
     switch (faultType) {
     case seL4_Fault_VMFault: {
         setMR(receiver, receiveIPCBuffer, seL4_VMFault_IP, getRestartPC(sender));
-        setMR(receiver, receiveIPCBuffer, seL4_VMFault_PrefetchFault,
-              seL4_Fault_VMFault_get_instructionFault(sender->tcbFault));
         setMR(receiver, receiveIPCBuffer, seL4_VMFault_Addr,
               seL4_Fault_VMFault_get_address(sender->tcbFault));
+        setMR(receiver, receiveIPCBuffer, seL4_VMFault_PrefetchFault,
+              seL4_Fault_VMFault_get_instructionFault(sender->tcbFault));
         return setMR(receiver, receiveIPCBuffer, seL4_VMFault_FSR,
                      seL4_Fault_VMFault_get_FSR(sender->tcbFault));
     }