diff --git a/block/blk-mq.c b/block/blk-mq.c
index 7b71ab1..fec8fcc 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1623,6 +1623,11 @@
 	if (set->timeout)
 		blk_queue_rq_timeout(q, set->timeout);
 
+	/*
+	 * Do this after blk_queue_make_request() overrides it...
+	 */
+	q->nr_requests = set->queue_depth;
+
 	if (set->ops->complete)
 		blk_queue_softirq_done(q, set->ops->complete);