diff --git a/src/include/86box/scsi_ncr5380.h b/src/include/86box/scsi_ncr5380.h
index 55692075b..09307fed6 100644
--- a/src/include/86box/scsi_ncr5380.h
+++ b/src/include/86box/scsi_ncr5380.h
@@ -104,6 +104,7 @@ typedef struct ncr_t {
     int     state;
     int     clear_req;
     int     wait_data;
+    int     wait_data_back;
     int     wait_complete;
     int     command_pos;
     int     data_pos;
diff --git a/src/scsi/scsi_ncr5380.c b/src/scsi/scsi_ncr5380.c
index 0c3af9282..c5fddc801 100644
--- a/src/scsi/scsi_ncr5380.c
+++ b/src/scsi/scsi_ncr5380.c
@@ -197,7 +197,7 @@ ncr5380_bus_read(ncr_t *ncr)
             phase = (ncr->cur_bus & SCSI_PHASE_MESSAGE_IN);
 
             if (phase == SCSI_PHASE_DATA_IN) {
-                if ((ncr->dma_mode == DMA_IDLE) || ncr->dma_initiator_receive_ext) {
+                if ((ncr->dma_mode == DMA_IDLE) || ncr->dma_initiator_receive_ext || (ncr->wait_data_back == 1)) {
                     ncr5380_log("Phase Data In.\n");
                     if ((dev->sc != NULL) && (dev->sc->temp_buffer != NULL))
                         ncr->tx_data = dev->sc->temp_buffer[ncr->data_pos++];
@@ -210,11 +210,12 @@ ncr5380_bus_read(ncr_t *ncr)
                     ncr->state = STATE_IDLE;
                     ncr->cur_bus &= ~BUS_BSY;
                 } else {
-                    if ((ncr->dma_mode == DMA_IDLE) || ncr->dma_send_ext)
+                    if ((ncr->dma_mode == DMA_IDLE) || ncr->dma_send_ext || (ncr->wait_data_back == 1))
                         ncr->state = STATE_DATAOUT;
                 }
             } else if (phase == SCSI_PHASE_STATUS) {
                 ncr5380_log("Phase Status.\n");
+                ncr->wait_data_back = 0;
                 ncr->cur_bus |= BUS_REQ;
                 ncr->state   = STATE_STATUS;
                 ncr->cur_bus = (ncr->cur_bus & ~BUS_DATAMASK) | BUS_SETDATA(dev->status) | BUS_DBP;
@@ -359,7 +360,7 @@ ncr5380_bus_update(ncr_t *ncr, int bus)
                         ncr5380_log("DMA mode idle IN=%d.\n", ncr->data_pos);
                         ncr->timer(ncr->priv, ncr->period);
                     } else {
-                        ncr5380_log("DMA mode IN=%d.\n", ncr->data_pos);
+                        pclog("DMA mode IN=%d.\n", ncr->data_pos);
                         ncr->clear_req = 3;
                     }
 
@@ -495,7 +496,7 @@ ncr5380_write(uint16_t port, uint8_t val, ncr_t *ncr)
             break;
 
         case 7: /* start DMA Initiator Receive */
-            ncr5380_log("[%04X:%08X]: Write: start DMA initiator receive register, dma? = %02x\n", CS, cpu_state.pc, ncr->mode & MODE_DMA);
+            pclog("[%04X:%08X]: Write: start DMA initiator receive register, dma? = %02x\n", CS, cpu_state.pc, ncr->mode & MODE_DMA);
             /*a Read 6/10 has occurred, start the timer when the block count is loaded*/
             ncr->dma_mode = DMA_INITIATOR_RECEIVE;
             if (ncr->dma_initiator_receive_ext)
diff --git a/src/scsi/scsi_ncr53c400.c b/src/scsi/scsi_ncr53c400.c
index 997e8f152..e028c7b42 100644
--- a/src/scsi/scsi_ncr53c400.c
+++ b/src/scsi/scsi_ncr53c400.c
@@ -193,6 +193,7 @@ ncr53c400_write(uint32_t addr, uint8_t val, void *priv)
                             else
                                 timer_on_auto(&ncr400->timer, ncr->period);
 
+                            ncr->wait_data_back = ncr->wait_data;
                             ncr53c400_log("DMA timer on=%02x, callback=%lf, scsi buflen=%d, waitdata=%d, waitcomplete=%d, clearreq=%d, datawait=%d, enabled=%d.\n",
                                   ncr->mode & MODE_MONITOR_BUSY, scsi_device_get_callback(dev), dev->buffer_length, ncr->wait_data, ncr->wait_complete, ncr->clear_req, ncr->data_wait, timer_is_enabled(&ncr400->timer));
                         }