diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index d9b5340..f6436b9 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -778,6 +778,9 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
 	 */
 	if (le16_to_cpu(mgmt->u.action.u.addba_resp.status)
 			== WLAN_STATUS_SUCCESS && buf_size) {
+		if (test_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state))
+			/* the addBA resp came too late */
+			goto out;
 		if (test_and_set_bit(HT_AGG_STATE_RESPONSE_RECEIVED,
 				     &tid_tx->state)) {
 			/* ignore duplicate response */