diff --git a/mt76x2_dma.c b/mt76x2_dma.c
index 06e027ad..8e5d9e65 100644
--- a/mt76x2_dma.c
+++ b/mt76x2_dma.c
@@ -54,6 +54,7 @@ mt76x2_init_tx_queue(struct mt76x2_dev *dev, struct mt76_queue *q,
 {
 	int ret;
 
+	q->hw_idx = idx;
 	q->regs = dev->mt76.regs + MT_TX_RING_BASE + idx * MT_RING_SIZE;
 	q->ndesc = n_desc;
 
diff --git a/mt76x2_main.c b/mt76x2_main.c
index bb6b3a75..091fe7c4 100644
--- a/mt76x2_main.c
+++ b/mt76x2_main.c
@@ -361,6 +361,8 @@ mt76x2_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u16 queue,
 	u8 cw_min = 5, cw_max = 10;
 	u32 val;
 
+	queue = dev->mt76.q_tx[queue].hw_idx;
+
 	if (params->cw_min)
 		cw_min = fls(params->cw_min);
 	if (params->cw_max)