diff --git a/sta.c b/sta.c
index 36cd840..9ebfd81 100644
--- a/sta.c
+++ b/sta.c
@@ -4740,6 +4740,7 @@
 		dut->btm_query_cand_list = NULL;
 		wpa_command(intf, "SET reject_btm_req_reason 0");
 		wpa_command(intf, "SET ignore_assoc_disallow 0");
+		wpa_command(intf, "SET gas_address3 0");
 	}
 
 	if (dut->program != PROGRAM_VHT)
@@ -6667,6 +6668,16 @@
 		return 0;
 	}
 
+	/* Set gas_address3 field to IEEE 802.11-2012 standard compliant form
+	 * (Address3 = Wildcard BSSID when sent to not-associated AP;
+	 * if associated, AP BSSID).
+	 */
+	if (wpa_command(intf, "SET gas_address3 1") < 0) {
+		send_resp(dut, conn, SIGMA_ERROR,
+			  "ErrorCode,Failed to set gas_address3");
+		return 0;
+	}
+
 	if (wpa_command(intf, buf) < 0) {
 		send_resp(dut, conn, SIGMA_ERROR,
 			  "ErrorCode,Failed to send ANQP query");