diff --git a/wpa_supplicant/gas_query.c b/wpa_supplicant/gas_query.c
index f6435bf7f..457f5fb64 100644
--- a/wpa_supplicant/gas_query.c
+++ b/wpa_supplicant/gas_query.c
@@ -366,7 +366,7 @@ static void gas_query_tx_comeback_req_delay(struct gas_query *gas,
 {
 	unsigned int secs, usecs;
 
-	if (query->offchannel_tx_started) {
+	if (comeback_delay > 1 && query->offchannel_tx_started) {
 		offchannel_send_action_done(gas->wpa_s);
 		query->offchannel_tx_started = 0;
 	}