--- /dev/null
+--- a/src/ap/wpa_auth.c
++++ b/src/ap/wpa_auth.c
+@@ -1288,7 +1288,7 @@ static void wpa_send_eapol(struct wpa_au
+ keyidx, encr, 0);
+
+ ctr = pairwise ? sm->TimeoutCtr : sm->GTimeoutCtr;
+- if (ctr == 1 && wpa_auth->conf.tx_status)
++ if (ctr == 1 && wpa_auth->conf.tx_status && pairwise)
+ timeout_ms = eapol_key_timeout_first;
+ else
+ timeout_ms = eapol_key_timeout_subseq;