diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
index 3c867bfb13..ea80392dea 100644
--- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
+++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
@@ -927,8 +927,6 @@ PeiDispatcher (
               Private->StackOffsetPositive = StackOffsetPositive;
               Private->StackOffset = StackOffset;
 
-              DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64)Private->HeapOffset, (UINT64)(StackOffset)));
-
               //
               // Build Stack HOB that describes the permanent memory stack
               //
@@ -966,7 +964,9 @@ PeiDispatcher (
                   Private->HeapOffsetPositive = FALSE;
                   Private->HeapOffset = (UINTN)((UINTN)SecCoreData->PeiTemporaryRamBase - BaseOfNewHeap);
                 }
-                
+
+                DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64) Private->HeapOffset, (UINT64) Private->StackOffset));
+
                 //
                 // Caculate new HandOffTable and PrivateData address in permanent memory's stack
                 //
@@ -1021,6 +1021,8 @@ PeiDispatcher (
                   Private->HeapOffset = (UINTN)((UINTN)SecCoreData->PeiTemporaryRamBase - BaseOfNewHeap);
                 }
 
+                DEBUG ((EFI_D_INFO, "Heap Offset = 0x%lX Stack Offset = 0x%lX\n", (UINT64) Private->HeapOffset, (UINT64) Private->StackOffset));
+
                 //
                 // Migrate Heap
                 //