diff --git a/BaseTools/ImageTool/PeScan.c b/BaseTools/ImageTool/PeScan.c
index d002d7080c..01388ad2a0 100644
--- a/BaseTools/ImageTool/PeScan.c
+++ b/BaseTools/ImageTool/PeScan.c
@@ -298,7 +298,7 @@ ScanPeGetSegmentInfo (
       memmove (
         ImageSegment->Data,
         ImageBuffer + Section->VirtualAddress,
-        MIN (Section->VirtualSize, Section->SizeOfRawData)
+        Section->VirtualSize
         );
 
       ImageSegment->DataSize     = Size;
@@ -337,7 +337,7 @@ ScanPeGetSegmentInfo (
       memmove (
         HiiInfo->Data,
         ImageBuffer + Section->VirtualAddress,
-        MIN (Section->VirtualSize, Section->SizeOfRawData)
+        Section->VirtualSize
         );
 
       HiiInfo->DataSize = Size;