diff --git a/os/hal/src/mmc_spi.c b/os/hal/src/mmc_spi.c
index 6fb7a8332..fd63d7838 100644
--- a/os/hal/src/mmc_spi.c
+++ b/os/hal/src/mmc_spi.c
@@ -460,7 +460,10 @@ bool_t mmcStopSequentialRead(MMCDriver *mmcp) {
   chSysUnlock();
 
   spiSend(mmcp->mmc_spip, sizeof(stopcmd), stopcmd);
-  result = recvr1(mmcp) != 0x00;
+/*  result = recvr1(mmcp) != 0x00;*/
+  /* Note, ignored r1 response, it can be not zero, unknown issue.*/
+  recvr1(mmcp);
+  result = FALSE;
   spiUnselect(mmcp->mmc_spip);
 
   chSysLock();
@@ -530,8 +533,10 @@ bool_t mmcSequentialWrite(MMCDriver *mmcp, const uint8_t *buffer) {
   spiSend(mmcp->mmc_spip, MMC_SECTOR_SIZE, buffer); /* Data.                */
   spiIgnore(mmcp->mmc_spip, 2);                     /* CRC ignored.         */
   spiReceive(mmcp->mmc_spip, 1, b);
-  if ((b[0] & 0x1F) == 0x05)
+  if ((b[0] & 0x1F) == 0x05) {
+    wait(mmcp);
     return FALSE;
+  }
 
   /* Error.*/
   spiUnselect(mmcp->mmc_spip);