diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_dpp.c b/components/wpa_supplicant/esp_supplicant/src/esp_dpp.c
index 818412ba38..ad59b8a913 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_dpp.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_dpp.c
@@ -264,7 +264,7 @@ static void gas_query_timeout(void *eloop_data, void *user_ctx)
 {
     struct dpp_authentication *auth = user_ctx;
 
-    if (!auth || !auth->auth_success) {
+    if (!s_dpp_ctx.dpp_auth || !s_dpp_ctx.dpp_auth->auth_success || (s_dpp_ctx.dpp_auth != auth)) {
         wpa_printf(MSG_INFO, "DPP-GAS: Auth %p state not correct", auth);
         return;
     }