diff --git a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
index 1aa67c6386..3e510a65a7 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBus.c
@@ -1210,7 +1210,7 @@ DiscoverScsiDevice (
     //
     // ANSI-approved version
     //
-    ScsiIoDevice->ScsiVersion = (UINT8) (InquiryData.Version & 0x03);
+    ScsiIoDevice->ScsiVersion = (UINT8) (InquiryData.Version & 0x07);
   }
 
   return TRUE;
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
index 1edff92c8e..94f05a5e04 100644
--- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
+++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
@@ -1195,7 +1195,7 @@ ScsiDiskReadCapacity (
 
   *NumberOfSenseKeys  = 0;
   *NeedRetry          = FALSE;
-  ScsiVersion         = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x03);
+  ScsiVersion         = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x07);
 
   if (ScsiVersion < SCSI_COMMAND_VERSION_3) {
     //
@@ -1505,7 +1505,7 @@ GetMediaInfo (
   UINT8       ScsiVersion;
   UINT8       *Ptr;
 
-  ScsiVersion    = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x03);
+  ScsiVersion    = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x07);
   ScsiDiskDevice->BlkIo.Media->LowestAlignedLba               = 0;
   ScsiDiskDevice->BlkIo.Media->LogicalBlocksPerPhysicalBlock  = 1;
   
@@ -1612,7 +1612,7 @@ ScsiDiskReadSectors (
 
   BlocksRemaining   = NumberOfBlocks;
   BlockSize         = ScsiDiskDevice->BlkIo.Media->BlockSize;
-  ScsiVersion       = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x03);
+  ScsiVersion       = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x07);
   
   //
   // limit the data bytes that can be transferred by one Read(10) or Read(16) Command
@@ -1736,7 +1736,7 @@ ScsiDiskWriteSectors (
 
   BlocksRemaining   = NumberOfBlocks;
   BlockSize         = ScsiDiskDevice->BlkIo.Media->BlockSize;
-  ScsiVersion       = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x03);
+  ScsiVersion       = (UINT8)(ScsiDiskDevice->InquiryData.Version & 0x07);
 
   //
   // limit the data bytes that can be transferred by one Read(10) or Read(16) Command