diff --git a/src/p2p/p2p_build.c b/src/p2p/p2p_build.c
index 984697619..791809e6e 100644
--- a/src/p2p/p2p_build.c
+++ b/src/p2p/p2p_build.c
@@ -168,7 +168,7 @@ void p2p_buf_add_device_info(struct wpabuf *buf, struct p2p_data *p2p,
 
 	/* Config Methods */
 	methods = 0;
-	if (peer) {
+	if (peer && peer->wps_method != WPS_NOT_READY) {
 		if (peer->wps_method == WPS_PBC)
 			methods |= WPS_CONFIG_PUSHBUTTON;
 		else if (peer->wps_method == WPS_PIN_LABEL)