diff --git a/EmbeddedPkg/Include/Library/PrePiLib.h b/EmbeddedPkg/Include/Library/PrePiLib.h
index 413b2809a9..77fd3f117f 100644
--- a/EmbeddedPkg/Include/Library/PrePiLib.h
+++ b/EmbeddedPkg/Include/Library/PrePiLib.h
@@ -655,7 +655,7 @@ LoadUefiImage (
   IN  VOID                                      *UefiImage,
   IN  UINT32                                    UefiImageSize,
   OUT EFI_PHYSICAL_ADDRESS  *ImageAddress,
-  OUT UINT64                *ImageSize,
+  OUT UINT32                *ImageSize,
   OUT EFI_PHYSICAL_ADDRESS  *EntryPoint
   );
 
diff --git a/EmbeddedPkg/Library/PrePiLib/PrePiLib.c b/EmbeddedPkg/Library/PrePiLib/PrePiLib.c
index fb27e60cd6..18f4523310 100644
--- a/EmbeddedPkg/Library/PrePiLib/PrePiLib.c
+++ b/EmbeddedPkg/Library/PrePiLib/PrePiLib.c
@@ -45,7 +45,7 @@ LoadUefiImage (
 
   ImageSize       = UefiImageGetImageSize (&ImageContext);
   BufferPages     = EFI_SIZE_TO_PAGES (ImageSize);
-  BufferSize      = EFI_PAGES_TO_SIZE (BufferSize);
+  BufferSize      = EFI_PAGES_TO_SIZE (BufferPages);
   BufferAlignment = UefiImageGetSegmentAlignment (&ImageContext);
 
   //