diff --git a/MdeModulePkg/Core/Dxe/SysCall/X64/CoreBootServices.nasm b/MdeModulePkg/Core/Dxe/SysCall/X64/CoreBootServices.nasm
index 9d72b81935..ca65415006 100644
--- a/MdeModulePkg/Core/Dxe/SysCall/X64/CoreBootServices.nasm
+++ b/MdeModulePkg/Core/Dxe/SysCall/X64/CoreBootServices.nasm
@@ -147,8 +147,8 @@ ASM_PFX(CoreBootServices):
     push    r8
     push    rdx
     mov     rbp, rsp
-    ; Reserve space on stack for 3 CallBootService arguments (NOOPT prerequisite).
-    sub     rsp, 8*3
+    ; Reserve space on stack for 4 CallBootService arguments (NOOPT prerequisite).
+    sub     rsp, 8*4
 
     ; Prepare CallBootService arguments.
     mov     rcx, r10
@@ -165,7 +165,7 @@ ASM_PFX(CoreBootServices):
     pop     rax
 
     ; Step over Arguments [1..3] and NOOPT buffer.
-    add     rsp, 8*6
+    add     rsp, 8*7
 
     ; Prepare SYSRET arguments.
     pop     r11