diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/CpuMpPei.c
index 53af9489b2..ca48613502 100644
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c
+++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.c
@@ -259,6 +259,11 @@ ApCFunction (
     // Execute AP function if AP is not disabled
     //
     GetProcessorNumber (PeiCpuMpData, &ProcessorNumber);
+    //
+    // Restore AP's volatile registers saved
+    //
+    RestoreVolatileRegisters (&PeiCpuMpData->CpuData[ProcessorNumber].VolatileRegisters, TRUE);
+
     if ((PeiCpuMpData->CpuData[ProcessorNumber].State != CpuStateDisabled) &&
         (PeiCpuMpData->ApFunction != 0)) {
       PeiCpuMpData->CpuData[ProcessorNumber].State = CpuStateBusy;
@@ -273,6 +278,11 @@ ApCFunction (
   //
   InterlockedIncrement ((UINT32 *)&PeiCpuMpData->FinishedCount);
 
+  //
+  // Save AP volatile registers
+  //
+  SaveVolatileRegisters (&PeiCpuMpData->CpuData[ProcessorNumber].VolatileRegisters);
+
   AsmCliHltLoop ();
 }