diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index a2cd5cdcd..53b6c5aa3 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -17,6 +17,7 @@ Release 3-dev
 ### Bugs fixed
 
 - (wifi) Fix setting of stations' max supported channel width
+- (wifi) Fix setting TX power for HE TB PPDUs in case AP requested using the max TX power
 
 Release 3.36.1
 --------------
diff --git a/src/wifi/model/he/he-frame-exchange-manager.cc b/src/wifi/model/he/he-frame-exchange-manager.cc
index 9d34fef02..5ea476629 100644
--- a/src/wifi/model/he/he-frame-exchange-manager.cc
+++ b/src/wifi/model/he/he-frame-exchange-manager.cc
@@ -1084,6 +1084,13 @@ HeFrameExchangeManager::GetHeTbTxVector (CtrlTriggerHeader trigger, Mac48Address
   NS_ASSERT_MSG (heConfiguration != 0, "This STA has to be an HE station to send an HE TB PPDU");
   v.SetBssColor (heConfiguration->GetBssColor ());
 
+  if (userInfoIt->IsUlTargetRssiMaxTxPower ())
+    {
+      NS_LOG_LOGIC ("AP requested using the max transmit power (" << m_phy->GetTxPowerEnd () << " dBm)");
+      v.SetTxPowerLevel (m_phy->GetNTxPower ());
+      return v;
+    }
+
   uint8_t powerLevel = m_mac->GetWifiRemoteStationManager ()->GetDefaultTxPowerLevel ();
   /**
    * Get the transmit power to use for an HE TB PPDU