diff --git a/sys/dev/ath/if_ath_tx_ht.c b/sys/dev/ath/if_ath_tx_ht.c
--- a/sys/dev/ath/if_ath_tx_ht.c
+++ b/sys/dev/ath/if_ath_tx_ht.c
@@ -296,12 +296,14 @@
 			 * we are always "out" by some amount.
 			 */
 			if (ni->ni_chw == IEEE80211_STA_RX_BW_40 &&
+			    (ni->ni_flags & IEEE80211_NODE_SGI40) != 0 &&
 			    ieee80211_ht_check_tx_shortgi_40(ni) &&
 			    (bf->bf_flags & ATH_BUF_TOA_PROBE) == 0) {
 				rc[i].flags |= ATH_RC_SGI_FLAG;
 			}
 
 			if (ni->ni_chw == IEEE80211_STA_RX_BW_40 &&
+			    (ni->ni_flags & IEEE80211_NODE_SGI20) != 0 &&
 			    ieee80211_ht_check_tx_shortgi_20(ni) &&
 			    (bf->bf_flags & ATH_BUF_TOA_PROBE) == 0) {
 				rc[i].flags |= ATH_RC_SGI_FLAG;