diff --git a/src/scsi/scsi_spock.c b/src/scsi/scsi_spock.c
index c500abfbc..6f0b7aacb 100644
--- a/src/scsi/scsi_spock.c
+++ b/src/scsi/scsi_spock.c
@@ -1050,7 +1050,7 @@ spock_callback(void *priv)
             spock_execute_cmd(scsi, scb);
     }
 
-    if (scsi->attention_wait) {
+    if (scsi->attention_wait && ((scsi->scb_state == 0) || (scsi->attention_pending & 0xf0) == 0xe0)) {
         scsi->attention_wait--;
         if (!scsi->attention_wait) {
             scsi->attention = scsi->attention_pending;