diff --git a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
index a30058bb5c..033d93eff8 100644
--- a/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
+++ b/EdkCompatibilityPkg/Compatibility/SmmBaseHelper/SmmBaseHelper.c
@@ -399,6 +399,8 @@ CallbackThunk (
     }
   }
 
+  mFrameworkSmst->SmmStartupThisAp      = gSmst->SmmStartupThisAp;
+  mFrameworkSmst->NumberOfCpus          = mNumberOfProcessors;
   mFrameworkSmst->CurrentlyExecutingCpu = gSmst->CurrentlyExecutingCpu;
 
   ///