diff --git a/src/wps/wps_registrar.c b/src/wps/wps_registrar.c
index 58a17ad7d..dbaf99357 100644
--- a/src/wps/wps_registrar.c
+++ b/src/wps/wps_registrar.c
@@ -1144,6 +1144,15 @@ static int wps_set_ie(struct wps_registrar *reg)
 		return -1;
 	}
 
+#ifdef CONFIG_P2P
+	if (wps_build_dev_name(&reg->wps->dev, beacon) ||
+	    wps_build_primary_dev_type(&reg->wps->dev, beacon)) {
+		wpabuf_free(beacon);
+		wpabuf_free(probe);
+		return -1;
+	}
+#endif /* CONFIG_P2P */
+
 	wpa_printf(MSG_DEBUG, "WPS: Build Probe Response IEs");
 
 	if (wps_build_version(probe) ||
@@ -1164,15 +1173,6 @@ static int wps_set_ie(struct wps_registrar *reg)
 		return -1;
 	}
 
-#ifdef CONFIG_P2P
-	if (wps_build_dev_name(&reg->wps->dev, beacon) ||
-	    wps_build_primary_dev_type(&reg->wps->dev, beacon)) {
-		wpabuf_free(beacon);
-		wpabuf_free(probe);
-		return -1;
-	}
-#endif /* CONFIG_P2P */
-
 	beacon = wps_ie_encapsulate(beacon);
 	probe = wps_ie_encapsulate(probe);