diff --git a/src/wifi/model/block-ack-agreement.cc b/src/wifi/model/block-ack-agreement.cc
index bdc716678..1648c54a1 100644
--- a/src/wifi/model/block-ack-agreement.cc
+++ b/src/wifi/model/block-ack-agreement.cc
@@ -51,8 +51,6 @@ void
 BlockAckAgreement::SetBufferSize(uint16_t bufferSize)
 {
     NS_LOG_FUNCTION(this << bufferSize);
-    NS_ASSERT(bufferSize <= 256);
-    NS_ASSERT(bufferSize % 16 == 0);
     m_bufferSize = bufferSize;
 }
 
diff --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc
index 076c61564..be99cced6 100644
--- a/src/wifi/model/wifi-mac.cc
+++ b/src/wifi/model/wifi-mac.cc
@@ -125,7 +125,7 @@ WifiMac::GetTypeId()
                 "The size (in number of MPDUs) of the buffer used for each BlockAck "
                 "agreement in which this node is a recipient. The provided value is "
                 "capped to the maximum allowed value based on the supported standard.",
-                UintegerValue(64),
+                UintegerValue(1024),
                 MakeUintegerAccessor(&WifiMac::GetMpduBufferSize, &WifiMac::SetMpduBufferSize),
                 MakeUintegerChecker<uint16_t>(1, 1024))
             .AddAttribute("VO_MaxAmsduSize",
diff --git a/src/wifi/test/wifi-emlsr-test.cc b/src/wifi/test/wifi-emlsr-test.cc
index baf09319f..d5012d523 100644
--- a/src/wifi/test/wifi-emlsr-test.cc
+++ b/src/wifi/test/wifi-emlsr-test.cc
@@ -156,6 +156,8 @@ EmlsrOperationsTestBase::DoSetup()
     RngSeedManager::SetRun(2);
     int64_t streamNumber = 100;
 
+    Config::SetDefault("ns3::WifiMac::MpduBufferSize", UintegerValue(64));
+
     NodeContainer wifiApNode(1);
     NodeContainer wifiStaNodes(m_nEmlsrStations);