diff --git a/mac80211.c b/mac80211.c
index 4a5cc2c9..3830455c 100644
--- a/mac80211.c
+++ b/mac80211.c
@@ -660,6 +660,7 @@ mt76_sta_add(struct mt76_dev *dev, struct ieee80211_vif *vif,
 		mt76_txq_init(dev, sta->txq[i]);
 	}
 
+	ewma_signal_init(&wcid->rssi);
 	rcu_assign_pointer(dev->wcid[wcid->idx], wcid);
 
 out:
diff --git a/mt76x02_util.c b/mt76x02_util.c
index e6aa3b67..9e3d48ab 100644
--- a/mt76x02_util.c
+++ b/mt76x02_util.c
@@ -191,8 +191,6 @@ int mt76x02_sta_add(struct mt76_dev *mdev, struct ieee80211_vif *vif,
 	if (vif->type == NL80211_IFTYPE_AP)
 		set_bit(MT_WCID_FLAG_CHECK_PS, &msta->wcid.flags);
 
-	ewma_signal_init(&msta->wcid.rssi);
-
 	return 0;
 }
 EXPORT_SYMBOL_GPL(mt76x02_sta_add);