diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 1564a3018cf50f04cbd47471f256732695535bcc..36e8e2de980c8cc1ab3de45e32b4dbd009d71069 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -558,6 +558,10 @@ ieee80211_tx_h_rate_ctrl(struct ieee80211_tx_data *tx)
 	if (unlikely(!info->control.rates[0].count))
 		info->control.rates[0].count = 1;
 
+	if (WARN_ON_ONCE((info->control.rates[0].count > 1) &&
+			 (info->flags & IEEE80211_TX_CTL_NO_ACK)))
+		info->control.rates[0].count = 1;
+
 	if (is_multicast_ether_addr(hdr->addr1)) {
 		/*
 		 * XXX: verify the rate is in the basic rateset