diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
index bd57b7792e..dcfe952219 100644
--- a/OvmfPkg/PlatformPei/MemDetect.c
+++ b/OvmfPkg/PlatformPei/MemDetect.c
@@ -142,8 +142,6 @@ MemDetect (
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();
   UpperMemorySize = GetSystemMemorySizeAbove4gb ();
 
-  PublishPeiMemory ();
-
   //
   // Create memory HOBs
   //
diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c
index 7363702bee..10ae623ddd 100644
--- a/OvmfPkg/PlatformPei/Platform.c
+++ b/OvmfPkg/PlatformPei/Platform.c
@@ -420,8 +420,9 @@ InitializePlatform (
 
   XenLeaf = XenDetect ();
 
+  PublishPeiMemory ();
+
   if (XenLeaf != 0) {
-    PublishPeiMemory ();
     PcdSetBool (PcdPciDisableBusEnumeration, TRUE);
   } else {
     TopOfMemory = MemDetect ();