diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index e261ef9..29ef374 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -486,8 +486,6 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s,
 
 	if (wpa_s->parent->set_ap_uapsd)
 		params.uapsd = wpa_s->parent->ap_uapsd;
-	else
-		params.uapsd = -1;
 
 	if (wpa_drv_associate(wpa_s, &params) < 0) {
 		wpa_msg(wpa_s, MSG_INFO, "Failed to start AP functionality");
@@ -511,7 +509,7 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s,
 		  wpa_s->conf->wmm_ac_params,
 		  sizeof(wpa_s->conf->wmm_ac_params));
 
-	if (params.uapsd > 0) {
+	if (params.uapsd) {
 		conf->bss->wmm_enabled = 1;
 		conf->bss->wmm_uapsd = 1;
 	}