diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index d01a5a44e..47a596e95 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -631,6 +631,9 @@ static char ** wpa_cli_complete_set(const char *str, int pos)
 		return res;
 	}
 
+	if (arg > 1 && os_strncasecmp(str, "set bssid_filter ", 17) == 0)
+		return cli_txt_list_array(&bsses);
+
 	return NULL;
 }