diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wps.c b/components/wpa_supplicant/esp_supplicant/src/esp_wps.c
index 97b2de3c577..ee7a7b45007 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_wps.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_wps.c
@@ -1521,13 +1521,13 @@ int wps_init_cfg_pin(struct wps_config *cfg)
         unsigned int spin = 0;
 
         cfg->dev_pw_id = DEV_PW_DEFAULT;
-        cfg->pin_len = 8;
         if (wps_generate_pin(&spin) < 0) {
             return -1;
         }
         wpa_printf(MSG_DEBUG, "WPS: Invalid PIN provided, generated a new PIN");
         os_snprintf((char *)cfg->pin, 9, "%08d", spin);
     }
+    cfg->pin_len = 8;
 
     return 0;
 }
diff --git a/components/wpa_supplicant/src/wps/wps_common.c b/components/wpa_supplicant/src/wps/wps_common.c
index 7d4288c7c60..0f6bccc7c6f 100644
--- a/components/wpa_supplicant/src/wps/wps_common.c
+++ b/components/wpa_supplicant/src/wps/wps_common.c
@@ -271,7 +271,7 @@ int wps_pin_str_valid(const char *pin)
 		return 0;
 
 	len = p - pin;
-	return len == 4 || len == 8;
+	return len == 8;
 }