Index: sys/net80211/ieee80211_hostap.c
===================================================================
--- sys/net80211/ieee80211_hostap.c
+++ sys/net80211/ieee80211_hostap.c
@@ -1723,7 +1723,8 @@
 		if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) &&
 		    scan.status == 0 &&			/* NB: on-channel */
 		    ((scan.erp & 0x100) == 0 ||		/* NB: no ERP, 11b sta*/
-		     (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT))) {
+		     (scan.erp & IEEE80211_ERP_NON_ERP_PRESENT)) &&
+		    is11bclient(scan.rates, scan.xrates)) {
 			ic->ic_lastnonerp = ticks;
 			ic->ic_flags_ext |= IEEE80211_FEXT_NONERP_PR;
 			if (ic->ic_protmode != IEEE80211_PROT_NONE &&