diff --git a/components/esp_wifi/include/esp_wifi.h b/components/esp_wifi/include/esp_wifi.h
index 5272a9b968b..0f8109d8d60 100644
--- a/components/esp_wifi/include/esp_wifi.h
+++ b/components/esp_wifi/include/esp_wifi.h
@@ -1608,6 +1608,8 @@ esp_err_t esp_wifi_config_80211_tx(wifi_interface_t ifx, wifi_tx_rate_config_t *
   * @brief      Disable PMF configuration for specified interface
   *
   * @attention  This API should be called after esp_wifi_set_config() and before esp_wifi_start().
+  * @attention  SoftAP: PMF cannot be disabled for `WIFI_AUTH_WPA3_PSK`, `WIFI_AUTH_WPA2_WPA3_PSK`, `WIFI_AUTH_OWE`, or when `wifi_ap_config_t.wpa3_compatible_mode` is enabled.
+  * @attention  Station: PMF cannot be disabled when `wifi_sta_config_t.threshold.authmode` is `WIFI_AUTH_WPA3_PSK`, `WIFI_AUTH_WPA2_WPA3_PSK`, or `WIFI_AUTH_OWE` (see `wifi_scan_threshold_t`), or when `disable_wpa3_compatible_mode` is false.
   *
   * @param      ifx  Interface to be configured.
   *
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index e8218e5e8e2..cde32e0a504 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit e8218e5e8e2717e1d6fd6cc612b3fc7bed4183c9
+Subproject commit cde32e0a504ec4083261156f807babf702967bb2
diff --git a/components/esp_wifi/remote/include/injected/esp_wifi.h b/components/esp_wifi/remote/include/injected/esp_wifi.h
index cde9c975f96..b043ccf4cb8 100644
--- a/components/esp_wifi/remote/include/injected/esp_wifi.h
+++ b/components/esp_wifi/remote/include/injected/esp_wifi.h
@@ -1608,6 +1608,8 @@ esp_err_t esp_wifi_config_80211_tx(wifi_interface_t ifx, wifi_tx_rate_config_t *
   * @brief      Disable PMF configuration for specified interface
   *
   * @attention  This API should be called after esp_wifi_set_config() and before esp_wifi_start().
+  * @attention  SoftAP: PMF cannot be disabled for `WIFI_AUTH_WPA3_PSK`, `WIFI_AUTH_WPA2_WPA3_PSK`, `WIFI_AUTH_OWE`, or when `wifi_ap_config_t.wpa3_compatible_mode` is enabled.
+  * @attention  Station: PMF cannot be disabled when `wifi_sta_config_t.threshold.authmode` is `WIFI_AUTH_WPA3_PSK`, `WIFI_AUTH_WPA2_WPA3_PSK`, or `WIFI_AUTH_OWE` (see `wifi_scan_threshold_t`), or when `disable_wpa3_compatible_mode` is false.
   *
   * @param      ifx  Interface to be configured.
   *