diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 6923181475..fd4778fdc7 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -445,7 +445,7 @@ Returns:
 
               PeiSwitchStacks (
                 InvokePeiCore,
-                (VOID*) (UINTN) PeiCore,
+                (VOID*) ((UINTN) EntryPoint + ((UINTN) PeiCore - (UINTN) _ModuleEntryPoint)),
                 (VOID*) &PeiCoreParameters,  
                 TopOfStack,
                 (VOID*)(UINTN)Private->StackBase