diff --git a/src/devices/machine/ncr5380n.cpp b/src/devices/machine/ncr5380n.cpp
index 926970b7e3e..fa043678831 100644
--- a/src/devices/machine/ncr5380n.cpp
+++ b/src/devices/machine/ncr5380n.cpp
@@ -183,6 +183,8 @@ void ncr5380n_device::scsi_ctrl_changed()
 			else
 			{
 				LOG("phase mismatch %d != %d\n", (ctrl & S_PHASE_MASK), (m_tcmd & TC_PHASE));
+
+				m_state = IDLE;
 				m_state_timer->enable(false);
 
 				set_irq(true);
@@ -525,7 +527,6 @@ int ncr5380n_device::state_step()
 				scsi_bus->ctrl_w(scsi_refid, S_ACK, S_ACK);
 			}
 		}
-		delay = 5;
 		break;
 	case DMA_OUT_ACK:
 		if (!(ctrl & S_REQ))