diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/NonMmramMapDxeSmm.c b/UefiCpuPkg/PiSmmCpuDxeSmm/NonMmramMapDxeSmm.c
index a98013b7d0..8c189ff6a0 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/NonMmramMapDxeSmm.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/NonMmramMapDxeSmm.c
@@ -546,6 +546,10 @@ IsSmmCommBufferForbiddenAddress (
   UINTN                  Index;
   EFI_MEMORY_DESCRIPTOR  *Entry;
 
+  if (!IsRestrictedMemoryAccess ()) {
+    return FALSE;
+  }
+
   if (mUefiMemoryMap != NULL) {
     MemoryMap           = mUefiMemoryMap;
     MemoryMapEntryCount = mUefiMemoryMapSize/mUefiDescriptorSize;
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
index 15d53b1411..29b6125dce 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/X64/PageTbl.c
@@ -815,7 +815,7 @@ SmiPFHandler (
       goto Exit;
     }
 
-    if (mCpuSmmRestrictedMemoryAccess && IsSmmCommBufferForbiddenAddress (PFAddress)) {
+    if (IsSmmCommBufferForbiddenAddress (PFAddress)) {
       DEBUG ((DEBUG_ERROR, "Access SMM communication forbidden address (0x%lx)!\n", PFAddress));
     }
   }