diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index a612b7329..017ebed81 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -31,6 +31,7 @@ Bugs fixed
 ----------
 - (wifi) #467 - WiFi: Failed association process
 - (wifi) #468 - WiFi: Wrong txDuration for trigger frame
+- (wifi) #475 - Wi-Fi: Assert when sending OFDMA DL to STAs with different TIDs
 
 Release 3.35
 ============
diff --git a/src/wifi/model/he/he-frame-exchange-manager.cc b/src/wifi/model/he/he-frame-exchange-manager.cc
index 38f765c0c..ca2cdcbde 100644
--- a/src/wifi/model/he/he-frame-exchange-manager.cc
+++ b/src/wifi/model/he/he-frame-exchange-manager.cc
@@ -289,7 +289,7 @@ HeFrameExchangeManager::SendPsduMap (void)
               uint8_t tid = *tids.begin ();
 
               NS_ASSERT (m_edca != 0);
-              m_edca->ScheduleBar (m_edca->PrepareBlockAckRequest (psdu.second->GetAddr1 (), tid));
+              m_edca->ScheduleBar (m_mac->GetQosTxop (tid)->PrepareBlockAckRequest (psdu.second->GetAddr1 (), tid));
             }
         }