diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c
index 41c5534e8..f94fc64b1 100644
--- a/wpa_supplicant/events.c
+++ b/wpa_supplicant/events.c
@@ -435,8 +435,15 @@ static int wpa_supplicant_ssid_bss_match(struct wpa_supplicant *wpa_s,
 		return 0;
 	}
 
-	/* Allow in non-WPA configuration */
-	return 1;
+	if (!wpa_key_mgmt_wpa(ssid->key_mgmt)) {
+		wpa_dbg(wpa_s, MSG_DEBUG, "   allow in non-WPA/WPA2");
+		return 1;
+	}
+
+	wpa_dbg(wpa_s, MSG_DEBUG, "   reject due to mismatch with "
+		"WPA/WPA2");
+
+	return 0;
 }