diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 9002b96..58ff1db 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -1437,7 +1437,7 @@
 
 	flow = &fq->flows[idx];
 
-	if (flow->txqi)
+	if (flow->txqi && flow->txqi != txqi)
 		flow = &txqi->flow;
 
 	/* The following overwrites `vif` pointer effectively. It is later