diff --git a/components/wpa_supplicant/src/common/sae.c b/components/wpa_supplicant/src/common/sae.c
index 363aa0c4fe..f5b61bad62 100644
--- a/components/wpa_supplicant/src/common/sae.c
+++ b/components/wpa_supplicant/src/common/sae.c
@@ -2312,10 +2312,10 @@ int sae_write_confirm(struct sae_data *sae, struct wpabuf *buf)
 	hash_len = sae->tmp->kck_len;
 
 	/* Send-Confirm */
-	sc = wpabuf_put(buf, 0);
-	wpabuf_put_le16(buf, sae->send_confirm);
 	if (sae->send_confirm < 0xffff)
 		sae->send_confirm++;
+	sc = wpabuf_put(buf, 0);
+	wpabuf_put_le16(buf, sae->send_confirm);
 
 	if (sae->tmp->ec) {
 		if (sae_cn_confirm_ecc(sae, sc, sae->tmp->own_commit_scalar,
diff --git a/examples/wifi/getting_started/softAP/sdkconfig.ci.wpa_psk b/examples/wifi/getting_started/softAP/sdkconfig.ci.wpa_psk
new file mode 100644
index 0000000000..4fee0b0352
--- /dev/null
+++ b/examples/wifi/getting_started/softAP/sdkconfig.ci.wpa_psk
@@ -0,0 +1 @@
+CONFIG_ESP_WIFI_SOFTAP_SAE_SUPPORT=n
diff --git a/examples/wifi/getting_started/station/sdkconfig.ci.wpa_psk b/examples/wifi/getting_started/station/sdkconfig.ci.wpa_psk
new file mode 100644
index 0000000000..bc969e6b4d
--- /dev/null
+++ b/examples/wifi/getting_started/station/sdkconfig.ci.wpa_psk
@@ -0,0 +1 @@
+CONFIG_ESP_WIFI_ENABLE_WPA3_SAE=n