diff --git a/drivers/block/nvme.c b/drivers/block/nvme.c
index 954a61018dc23bbddf7b906e18e87a036d3a1f3f..af88635e44e4e90a0f7a7e128c7764955945a134 100644
--- a/drivers/block/nvme.c
+++ b/drivers/block/nvme.c
@@ -909,6 +909,10 @@ static void nvme_free_queue(struct nvme_dev *dev, int qid)
 
 	spin_lock_irq(&nvmeq->q_lock);
 	nvme_cancel_ios(nvmeq, false);
+	while (bio_list_peek(&nvmeq->sq_cong)) {
+		struct bio *bio = bio_list_pop(&nvmeq->sq_cong);
+		bio_endio(bio, -EIO);
+	}
 	spin_unlock_irq(&nvmeq->q_lock);
 
 	irq_set_affinity_hint(vector, NULL);