diff --git a/sys/net80211/ieee80211_ht.c b/sys/net80211/ieee80211_ht.c
index d91e6a04bc2f..364ed2456d64 100644
--- a/sys/net80211/ieee80211_ht.c
+++ b/sys/net80211/ieee80211_ht.c
@@ -829,8 +829,7 @@ ieee80211_ht_node_cleanup(struct ieee80211_node *ni)
 		ampdu_rx_stop(&ni->ni_rx_ampdu[i]);
 
 	ni->ni_htcap = 0;
-	ni->ni_flags &= ~(IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT |
-		IEEE80211_NODE_AMPDU);
+	ni->ni_flags &= ~IEEE80211_NODE_HT_ALL;
 }
 
 /*
diff --git a/sys/net80211/ieee80211_node.h b/sys/net80211/ieee80211_node.h
index b4feadbbd4ea..1935d0c4e35e 100644
--- a/sys/net80211/ieee80211_node.h
+++ b/sys/net80211/ieee80211_node.h
@@ -194,6 +194,9 @@ MALLOC_DECLARE(M_80211_NODE_IE);
 #define	IEEE80211_NODE_ATH	(IEEE80211_NODE_FF | IEEE80211_NODE_TURBOP)
 #define	IEEE80211_NODE_AMPDU \
 	(IEEE80211_NODE_AMPDU_RX | IEEE80211_NODE_AMPDU_TX)
+#define	IEEE80211_NODE_HT_ALL \
+	(IEEE80211_NODE_HT | IEEE80211_NODE_HTCOMPAT | \
+	 IEEE80211_NODE_AMPDU)
 
 #define	IEEE80211_NODE_AID(ni)	IEEE80211_AID(ni->ni_associd)