diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
index c8a588e520..4ee9309e7c 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBus.c
@@ -52,7 +52,7 @@ ATA_DEVICE gAtaDeviceTemplate = {
     FALSE,                     // ReadOnly
     FALSE,                     // WritingCache
     0x200,                     // BlockSize 
-    4,                         // IoAlign
+    0,                         // IoAlign
     0,                         // LastBlock
     0,                         // LowestAlignedLba
     1                          // LogicalBlocksPerPhysicalBlock
diff --git a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
index f4388a6c44..05496a9d16 100644
--- a/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
+++ b/MdeModulePkg/Bus/Ata/AtaBusDxe/AtaPassThruExecute.c
@@ -289,6 +289,7 @@ IdentifyAtaDevice (
   //
   BlockMedia = &AtaDevice->BlockMedia;
   BlockMedia->LastBlock = Capacity - 1;
+  BlockMedia->IoAlign = AtaDevice->AtaBusDriverData->AtaPassThru->Mode->IoAlign;
   //
   // Check whether Long Physical Sector Feature is supported
   //