diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 8661932a152aa89b797df1b6ae353319d177666a..a66d2b0a98dbb609a505430c5a402ad6a42b4682 100644
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -255,10 +255,8 @@ static bool scsi_handle_rw_error(SCSIDiskReq *r, int ret, bool acct_failed)
     }
 }
 
-static bool scsi_disk_req_check_error(SCSIDiskReq *r, int ret, bool acct_failed)
+static bool scsi_disk_req_handle_error(SCSIDiskReq *r, int ret, bool acct_failed)
 {
-    SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
-
     if (r->req.io_canceled) {
         scsi_req_cancel_complete(&r->req);
         return true;
@@ -268,6 +266,17 @@ static bool scsi_disk_req_check_error(SCSIDiskReq *r, int ret, bool acct_failed)
         return scsi_handle_rw_error(r, ret, acct_failed);
     }
 
+    return false;
+}
+
+static bool scsi_disk_req_check_error(SCSIDiskReq *r, int ret, bool acct_failed)
+{
+    SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, r->req.dev);
+
+    if (r->req.io_canceled || ret < 0) {
+        return scsi_disk_req_handle_error(r, ret, acct_failed);
+    }
+
     blk_error_retry_reset_timeout(s->qdev.conf.blk);
     return false;
 }
@@ -418,7 +427,7 @@ static void scsi_do_read(SCSIDiskReq *r, int ret)
     SCSIDiskClass *sdc = (SCSIDiskClass *) object_get_class(OBJECT(s));
 
     assert (r->req.aiocb == NULL);
-    if (scsi_disk_req_check_error(r, ret, false)) {
+    if (scsi_disk_req_handle_error(r, ret, false)) {
         goto done;
     }
 
@@ -458,6 +467,9 @@ static void scsi_do_read_cb(void *opaque, int ret)
         block_acct_failed(blk_get_stats(s->qdev.conf.blk), &r->acct);
     } else {
         block_acct_done(blk_get_stats(s->qdev.conf.blk), &r->acct);
+        if (!r->req.io_canceled) {
+            blk_error_retry_reset_timeout(s->qdev.conf.blk);
+        }
     }
     scsi_do_read(opaque, ret);
     aio_context_release(blk_get_aio_context(s->qdev.conf.blk));
diff --git a/monitor/monitor.c b/monitor/monitor.c
index 28206bedc4b67318507a7366e30fa065d5b85625..257ef4ee5430b0ceca4a9f055831ef74630de803 100644
--- a/monitor/monitor.c
+++ b/monitor/monitor.c
@@ -301,7 +301,6 @@ static MonitorQAPIEventConf monitor_qapi_event_conf[QAPI_EVENT__MAX] = {
     [QAPI_EVENT_QUORUM_FAILURE]    = { 1000 * SCALE_MS },
     [QAPI_EVENT_VSERPORT_CHANGE]   = { 1000 * SCALE_MS },
     [QAPI_EVENT_MEMORY_DEVICE_SIZE_CHANGE] = { 1000 * SCALE_MS },
-    [QAPI_EVENT_BLOCK_IO_ERROR]    = { 60L * 1000 * SCALE_MS },
 };
 
 /*