diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c
index a2a0781..69d63b0 100644
--- a/core/rtw_sta_mgt.c
+++ b/core/rtw_sta_mgt.c
@@ -775,6 +775,10 @@ u32	rtw_free_stainfo(_adapter *padapter , struct sta_info *psta)
 			pstapriv->sta_aid[psta->cmn.aid - 1] = NULL;
 			psta->cmn.aid = 0;
 		}
+		if (psta->aid > 31) {
+			pr_err("***** psta->aid (%d) out of bounds\n", psta->aid);
+			return _FAIL;
+		}
 	}
 
 #endif /* CONFIG_NATIVEAP_MLME	 */