diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 5e73ab406..717a5eefb 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -4405,6 +4405,8 @@ static void wpa_supplicant_event_assoc_auth(struct wpa_supplicant *wpa_s,
 
 	wpa_supplicant_event_port_authorized(wpa_s);
 
+	wpa_s->last_eapol_matches_bssid = 1;
+
 	wpa_sm_set_rx_replay_ctr(wpa_s->wpa, data->assoc_info.key_replay_ctr);
 	wpa_sm_set_ptk_kck_kek(wpa_s->wpa, data->assoc_info.ptk_kck,
 			       data->assoc_info.ptk_kck_len,