diff --git a/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/MpServicesOnFrameworkMpServicesThunk.c b/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/MpServicesOnFrameworkMpServicesThunk.c
index a2b3e1ab5f..eb281d6e76 100644
--- a/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/MpServicesOnFrameworkMpServicesThunk.c
+++ b/EdkCompatibilityPkg/Compatibility/MpServicesOnFrameworkMpServicesThunk/MpServicesOnFrameworkMpServicesThunk.c
@@ -1137,6 +1137,12 @@ ApProcWrapper (
   UINTN                 ProcessorNumber;
   CPU_DATA_BLOCK        *CpuData;
 
+  //
+  // Program virtual wire mode for AP, since it will be lost after AP wake up
+  //
+  ProgramVirtualWireMode ();
+  DisableLvtInterrupts ();
+
   //
   // Initialize Debug Agent to support source level debug on AP code.
   //