diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
index 3534d9fc23..469a40ac39 100644
--- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
+++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
@@ -427,13 +427,7 @@ AhciEnableFisReceive (
   Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CMD;
   AhciOrReg (PciIo, Offset, EFI_AHCI_PORT_CMD_FRE);
 
-  return AhciWaitMmioSet (
-           PciIo,
-           Offset,
-           EFI_AHCI_PORT_CMD_FR,
-           EFI_AHCI_PORT_CMD_FR,
-           Timeout
-           );
+  return EFI_SUCCESS;
 }
 
 /**
@@ -2344,16 +2338,6 @@ AhciModeInitialization (
       //
       Offset = EFI_AHCI_PORT_START + Port * EFI_AHCI_PORT_REG_WIDTH + EFI_AHCI_PORT_CMD;
       AhciOrReg (PciIo, Offset, EFI_AHCI_PORT_CMD_FRE);
-      Status = AhciWaitMmioSet (
-                 PciIo,
-                 Offset,
-                 EFI_AHCI_PORT_CMD_FR,
-                 EFI_AHCI_PORT_CMD_FR,
-                 EFI_AHCI_PORT_CMD_FR_CLEAR_TIMEOUT
-                 );
-      if (EFI_ERROR (Status)) {
-        continue;
-      }
 
       //
       // Wait no longer than 10 ms to wait the Phy to detect the presence of a device.