diff --git a/src/netdev.c b/src/netdev.c
index 50e60c5d..fb095fdc 100644
--- a/src/netdev.c
+++ b/src/netdev.c
@@ -3776,7 +3776,8 @@ static int netdev_handshake_state_setup_connection_type(
 	case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256:
 	case IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384:
 		/* FILS has no offload in any upstream driver */
-		if (softmac)
+		if (softmac && wiphy_has_ext_feature(wiphy,
+						NL80211_EXT_FEATURE_FILS_STA))
 			goto softmac;
 
 		return -ENOTSUP;
diff --git a/src/wiphy.c b/src/wiphy.c
index 6b755ff8..13d498a5 100644
--- a/src/wiphy.c
+++ b/src/wiphy.c
@@ -277,6 +277,7 @@ enum ie_rsn_akm_suite wiphy_select_akm(struct wiphy *wiphy,
 	 */
 	if (security == SECURITY_8021X) {
 		if (wiphy_has_ext_feature(wiphy, NL80211_EXT_FEATURE_FILS_STA) &&
+				wiphy->support_cmds_auth_assoc &&
 				fils_capable_hint) {
 			if ((info->akm_suites &
 					IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384) &&