diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c
index 8260c48a30..f6dd8385b1 100644
--- a/firmware/target/arm/as3525/ata_sd_as3525.c
+++ b/firmware/target/arm/as3525/ata_sd_as3525.c
@@ -735,12 +735,8 @@ static int sd_transfer_sectors(IF_MD2(int drive,) unsigned long start,
 
         wakeup_wait(&transfer_completion_signal, TIMEOUT_BLOCK);
 
-        /* Higher speed class cards need a write delay here for some reason */
-        if((drive == SD_SLOT_AS3525) && write)
-        {
-            int delay = 3500;
-            while(delay--)  asm volatile ("nop\n");
-        }
+        /*  Wait for FIFO to empty  */
+        while(MCI_STATUS(drive) & (MCI_TX_ACTIVE | MCI_RX_ACTIVE));
 
         if(!transfer_error[drive])
         {