diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c
index 7907267a2..06d6d2e4a 100644
--- a/wpa_supplicant/ap.c
+++ b/wpa_supplicant/ap.c
@@ -469,6 +469,7 @@ int wpa_supplicant_create_ap(struct wpa_supplicant *wpa_s,
 		return -1;
 	}
 
+	wpa_s->current_ssid = ssid;
 	wpa_supplicant_set_state(wpa_s, WPA_COMPLETED);
 
 	return 0;