diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
index 959e993bda..93bb67ce7a 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.c
@@ -163,6 +163,11 @@ SmmReadyToLockEventNotify (
     // Get Software SMI from FADT
     //
     GetSmiCommandPort ();
+
+    //
+    // Initialize protected memory range for patching page table later.
+    //
+    InitProtectedMemRange ();
   }
 
   //
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuStandaloneMm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuStandaloneMm.c
index 005fbcd968..d8aaff811c 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuStandaloneMm.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuStandaloneMm.c
@@ -221,6 +221,16 @@ PiCpuStandaloneMmEntry (
     // Get Software SMI
     //
     GetSmiCommandPort ();
+
+    //
+    // Initialize protected memory range for patching page table later.
+    //
+    InitProtectedMemRange ();
+
+    //
+    // Start SMM Profile feature
+    //
+    SmmProfileStart ();
   }
 
   //
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
index bbac6064e2..0e95fc0eb3 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.c
@@ -738,11 +738,6 @@ InitSmmProfileCallBack (
                         &mSmmProfileBase
                         );
 
-  //
-  // Initialize protected memory range for patching page table later.
-  //
-  InitProtectedMemRange ();
-
   return EFI_SUCCESS;
 }
 
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h
index b34aab41ef..fc4c2731a0 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfile.h
@@ -90,6 +90,15 @@ CheckFeatureSupported (
   IN UINTN  CpuIndex
   );
 
+/**
+  Initialize the protected memory ranges and the 4KB-page mapped memory ranges.
+
+**/
+VOID
+InitProtectedMemRange (
+  VOID
+  );
+
 /**
   Update page table according to protected memory ranges and the 4KB-page mapped memory ranges.