diff --git a/src/wifi/model/he/he-configuration.cc b/src/wifi/model/he/he-configuration.cc
index 143bdeed4..f14310e6b 100644
--- a/src/wifi/model/he/he-configuration.cc
+++ b/src/wifi/model/he/he-configuration.cc
@@ -67,11 +67,12 @@ HeConfiguration::GetTypeId()
                                            &HeConfiguration::SetMaxTbPpduDelay),
                           MakeTimeChecker(Seconds(0)))
             .AddAttribute("MpduBufferSize",
-                          "The MPDU buffer size for receiving A-MPDUs",
+                          "This attribute is obsolete. Use the WifiMac::MpduBufferSize attribute "
+                          "instead.",
                           UintegerValue(64),
-                          MakeUintegerAccessor(&HeConfiguration::GetMpduBufferSize,
-                                               &HeConfiguration::SetMpduBufferSize),
-                          MakeUintegerChecker<uint16_t>(64, 256))
+                          MakeUintegerAccessor(&HeConfiguration::m_mpduBufferSize),
+                          MakeUintegerChecker<uint16_t>(64, 256),
+                          TypeId::OBSOLETE)
             .AddAttribute("MuBeAifsn",
                           "AIFSN used by BE EDCA when the MU EDCA Timer is running. "
                           "It must be either zero (EDCA disabled) or a value from 2 to 15.",
@@ -223,17 +224,4 @@ HeConfiguration::SetMaxTbPpduDelay(Time maxTbPpduDelay)
     m_maxTbPpduDelay = maxTbPpduDelay;
 }
 
-void
-HeConfiguration::SetMpduBufferSize(uint16_t size)
-{
-    NS_LOG_FUNCTION(this << size);
-    m_mpduBufferSize = size;
-}
-
-uint16_t
-HeConfiguration::GetMpduBufferSize() const
-{
-    return m_mpduBufferSize;
-}
-
 } // namespace ns3
diff --git a/src/wifi/model/he/he-configuration.h b/src/wifi/model/he/he-configuration.h
index d06fb8b2c..e8c45302d 100644
--- a/src/wifi/model/he/he-configuration.h
+++ b/src/wifi/model/he/he-configuration.h
@@ -68,14 +68,6 @@ class HeConfiguration : public Object
      * \return the maximum TB PPDU delay
      */
     Time GetMaxTbPpduDelay() const;
-    /**
-     * \param size the MPDU buffer size to receive A-MPDUs
-     */
-    void SetMpduBufferSize(uint16_t size);
-    /**
-     * \return the MPDU buffer size to receive A-MPDUs
-     */
-    uint16_t GetMpduBufferSize() const;
 
   private:
     Time m_guardInterval;      //!< Supported HE guard interval
diff --git a/src/wifi/model/he/he-frame-exchange-manager.cc b/src/wifi/model/he/he-frame-exchange-manager.cc
index 81c3c7481..04d5e26f7 100644
--- a/src/wifi/model/he/he-frame-exchange-manager.cc
+++ b/src/wifi/model/he/he-frame-exchange-manager.cc
@@ -96,17 +96,6 @@ HeFrameExchangeManager::Reset()
     VhtFrameExchangeManager::Reset();
 }
 
-uint16_t
-HeFrameExchangeManager::GetSupportedBaBufferSize() const
-{
-    NS_ASSERT(m_mac->GetHeConfiguration());
-    if (m_mac->GetHeConfiguration()->GetMpduBufferSize() > 64)
-    {
-        return 256;
-    }
-    return 64;
-}
-
 void
 HeFrameExchangeManager::SetWifiMac(const Ptr<WifiMac> mac)
 {
diff --git a/src/wifi/model/he/he-frame-exchange-manager.h b/src/wifi/model/he/he-frame-exchange-manager.h
index 876e95711..60e857ea6 100644
--- a/src/wifi/model/he/he-frame-exchange-manager.h
+++ b/src/wifi/model/he/he-frame-exchange-manager.h
@@ -75,7 +75,6 @@ class HeFrameExchangeManager : public VhtFrameExchangeManager
     HeFrameExchangeManager();
     ~HeFrameExchangeManager() override;
 
-    uint16_t GetSupportedBaBufferSize() const override;
     bool StartFrameExchange(Ptr<QosTxop> edca, Time availableTime, bool initialFrame) override;
     void SetWifiMac(const Ptr<WifiMac> mac) override;
     void CalculateAcknowledgmentTime(WifiAcknowledgment* acknowledgment) const override;
diff --git a/src/wifi/model/ht/ht-frame-exchange-manager.cc b/src/wifi/model/ht/ht-frame-exchange-manager.cc
index 21e3dc63b..dbf3022fd 100644
--- a/src/wifi/model/ht/ht-frame-exchange-manager.cc
+++ b/src/wifi/model/ht/ht-frame-exchange-manager.cc
@@ -309,12 +309,6 @@ HtFrameExchangeManager::SendAddBaResponse(const MgtAddBaRequestHeader* reqHdr,
     m_mac->GetQosTxop(tid)->Queue(mpdu);
 }
 
-uint16_t
-HtFrameExchangeManager::GetSupportedBaBufferSize() const
-{
-    return 64;
-}
-
 void
 HtFrameExchangeManager::SendDelbaFrame(Mac48Address addr, uint8_t tid, bool byOriginator)
 {
diff --git a/src/wifi/model/ht/ht-frame-exchange-manager.h b/src/wifi/model/ht/ht-frame-exchange-manager.h
index 0264eb926..1d8c16238 100644
--- a/src/wifi/model/ht/ht-frame-exchange-manager.h
+++ b/src/wifi/model/ht/ht-frame-exchange-manager.h
@@ -148,13 +148,6 @@ class HtFrameExchangeManager : public QosFrameExchangeManager
      * \param originator the MAC address of the originator.
      */
     void SendAddBaResponse(const MgtAddBaRequestHeader* reqHdr, Mac48Address originator);
-    /**
-     * Get the maximum supported buffer size for a Block Ack agreement. This value
-     * is typically included in ADDBA Response frames.
-     *
-     * \return the maximum supported buffer size for a Block Ack agreement
-     */
-    virtual uint16_t GetSupportedBaBufferSize() const;
 
     /**
      * Sends DELBA frame to cancel a block ack agreement with STA