diff --git a/block/blk-mq.c b/block/blk-mq.c
index bcb402f9bff6..623e8a506539 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -4037,7 +4037,7 @@ void blk_mq_destroy_queue(struct request_queue *q)
 
 	blk_queue_flag_set(QUEUE_FLAG_DYING, q);
 	blk_queue_start_drain(q);
-	blk_freeze_queue(q);
+	blk_mq_freeze_queue_wait(q);
 
 	blk_sync_queue(q);
 	blk_mq_cancel_work_sync(q);