diff --git a/mac80211.c b/mac80211.c
index 8f41e8ea..c30d8a8d 100644
--- a/mac80211.c
+++ b/mac80211.c
@@ -205,6 +205,8 @@ int mt76_register_device(struct mt76_dev *dev, bool vht,
 
 	wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR;
 
+	hw->txq_data_size = sizeof(struct mt76_txq);
+
 	ieee80211_hw_set(hw, SIGNAL_DBM);
 	ieee80211_hw_set(hw, PS_NULLFUNC_STACK);
 	ieee80211_hw_set(hw, SUPPORTS_HT_CCK_RATES);
diff --git a/mt76x2_init.c b/mt76x2_init.c
index 8f3d331d..2229cd20 100644
--- a/mt76x2_init.c
+++ b/mt76x2_init.c
@@ -637,7 +637,6 @@ int mt76x2_register_device(struct mt76x2_dev *dev)
 
 	hw->sta_data_size = sizeof(struct mt76x2_sta);
 	hw->vif_data_size = sizeof(struct mt76x2_vif);
-	hw->txq_data_size = sizeof(struct mt76_txq);
 
 	dev->macaddr[0] &= ~BIT(1);
 	SET_IEEE80211_PERM_ADDR(hw, dev->macaddr);