diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
index fc380e59c740..41f6be7fe75e 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c
@@ -380,13 +380,8 @@ static int iwl_mvm_mld_cfg_sta(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 	u32 agg_size = 0, mpdu_dens = 0;
 
 	/* For now the link addr is the same as the mld addr */
-	if (vif->type == NL80211_IFTYPE_AP) {
-		memcpy(&cmd.peer_mld_address, sta->addr, ETH_ALEN);
-		memcpy(&cmd.peer_link_address, sta->addr, ETH_ALEN);
-	} else if (vif->bss_conf.bssid) {
-		memcpy(&cmd.peer_mld_address, vif->bss_conf.bssid, ETH_ALEN);
-		memcpy(&cmd.peer_link_address, vif->bss_conf.bssid, ETH_ALEN);
-	}
+	memcpy(&cmd.peer_mld_address, sta->addr, ETH_ALEN);
+	memcpy(&cmd.peer_link_address, sta->addr, ETH_ALEN);
 
 	if (mvm_sta->sta_state >= IEEE80211_STA_ASSOC)
 		cmd.assoc_id = cpu_to_le32(sta->aid);