diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 1c333ce64bd441c2b72c909b7c21f79664de65fd..c777f56a9e74f5da6e5edf5cb091e3178704039b 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -4956,6 +4956,7 @@ int nvme_alloc_io_tag_set(struct nvme_ctrl *ctrl, struct blk_mq_tag_set *set,
 
 out_free_tag_set:
 	blk_mq_free_tag_set(set);
+	ctrl->connect_q = NULL;
 	return ret;
 }
 EXPORT_SYMBOL_GPL(nvme_alloc_io_tag_set);