diff --git a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S
index 7c56d717f8..068db95b1d 100644
--- a/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S
+++ b/MdeModulePkg/Core/Dxe/SysCall/AARCH64/CoreBootServices.S
@@ -107,6 +107,9 @@ ASM_FUNC(ArmCallRing3)
 ASM_FUNC(ReturnToCore)
   // Zero Exception Syndrome Register to prevent QEMU from random crashing.
   msr  esr_el1, xzr
+  msr  spsr_el1, xzr
+  msr  elr_el1, xzr
+  msr  far_el1, xzr
   // Switch to Core Stack.
   mov  sp, x1
   // Restore Stack.