diff --git a/block/blk-mq.c b/block/blk-mq.c
index c5068f065ccb..70253eaab088 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -5183,6 +5183,9 @@ static void __blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set,
 			goto fallback;
 		}
 		blk_mq_map_swqueue(q);
+		/* The new hctxs don't know yet that they share their tags */
+		if (set->flags & BLK_MQ_F_TAG_QUEUE_SHARED)
+			queue_set_hctx_shared(q, true);
 	}
 switch_back:
 	/* The blk_mq_elv_switch_back unfreezes queue for us. */