diff --git a/src/ap/ap_config.c b/src/ap/ap_config.c
index be2e47122..11324257a 100644
--- a/src/ap/ap_config.c
+++ b/src/ap/ap_config.c
@@ -1210,6 +1210,13 @@ static bool hostapd_config_check_bss_6g(struct hostapd_bss_config *bss)
 		return false;
 	}
 
+#ifdef CONFIG_SAE
+	if (wpa_key_mgmt_sae(bss->wpa_key_mgmt) && !bss->sae_pwe) {
+		wpa_printf(MSG_INFO, "SAE: Enabling SAE H2E on 6 GHz");
+		bss->sae_pwe = 2;
+	}
+#endif /* CONFIG_SAE */
+
 	return true;
 }