diff --git a/src/disp/wfd-session.c b/src/disp/wfd-session.c
index 5b3c3b8..5fd0286 100644
--- a/src/disp/wfd-session.c
+++ b/src/disp/wfd-session.c
@@ -149,7 +149,7 @@ void wfd_session_set_state(struct wfd_session *s,
 	wfd_fn_session_properties_changed(s, "State");
 }
 
-bool wfd_session_is_established(struct wfd_session *s)
+int wfd_session_is_established(struct wfd_session *s)
 {
 	assert_retv(wfd_is_session(s), false);
 
diff --git a/src/wifi/wifid-supplicant.c b/src/wifi/wifid-supplicant.c
index 569c71b..1c812aa 100644
--- a/src/wifi/wifid-supplicant.c
+++ b/src/wifi/wifid-supplicant.c
@@ -1526,11 +1526,12 @@ static void supplicant_try_ready(struct supplicant *s)
 		s->has_wfd = false;
 
 	s->running = true;
-	link_supplicant_started(s->l);
-	link_supplicant_p2p_state_known(s->l, s->has_p2p ? 1 : -1);
 
 	LINK_FOREACH_PEER(p, s->l)
 		peer_supplicant_started(p);
+
+	link_supplicant_started(s->l);
+	link_supplicant_p2p_state_known(s->l, s->has_p2p ? 1 : -1);
 }
 
 static int supplicant_p2p_set_disallow_freq_fn(struct wpas *w,