diff --git a/block/blk-core.c b/block/blk-core.c
index 546a115ef6b01857bf97a68bc602b4fc927b6a67..8a27c8428855e50bab11cc0ff8e39db2036f4064 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -411,7 +411,6 @@ void blk_sync_queue(struct request_queue *q)
 		struct blk_mq_hw_ctx *hctx;
 		int i;
 
-		cancel_delayed_work_sync(&q->requeue_work);
 		queue_for_each_hw_ctx(q, hctx, i)
 			cancel_delayed_work_sync(&hctx->run_work);
 	} else {
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 49fcf44d943625df4392a1aa356c64f65cc3947b..e49dfb0946b389464cb7fd0116378be8f1628d6e 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2491,6 +2491,8 @@ void blk_mq_release(struct request_queue *q)
 	struct blk_mq_hw_ctx *hctx;
 	unsigned int i;
 
+	cancel_delayed_work_sync(&q->requeue_work);
+
 	/* hctx kobj stays in hctx */
 	queue_for_each_hw_ctx(q, hctx, i) {
 		if (!hctx)