diff --git a/AUTHORS b/AUTHORS
index 848c9a07f..f42bfc579 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -172,6 +172,7 @@ Mike Moreton (mjvm_ns@hotmail.com)
 Michele Muccio (michelemuccio@virgilio.it)
 Esteban Municio (esteban.municio@urjc.es)
 Sidharth Nabar (snabar@uw.edu)
+Sharan Naribole (sharan.naribole@gmail.com)
 Hemanth Narra (hemanth@ittc.ku.edu)
 Roman Naumann (naumann@informatik.hu-berlin.de)
 Ben Newton (bn@cs.unc.edu)
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 4012875c1..2c33cc68b 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -47,6 +47,8 @@ New user-visible features
 Bugs fixed
 ----------
 - (antenna) Fix random angle generation for the 3gpp channel model.
+- (wifi) #418 - Fix HE A-MPDU Max Size Upper Bound
+
 
 Release 3.33
 ============
diff --git a/src/wifi/model/he/he-capabilities.cc b/src/wifi/model/he/he-capabilities.cc
index b9c29192d..a6ed21ce2 100644
--- a/src/wifi/model/he/he-capabilities.cc
+++ b/src/wifi/model/he/he-capabilities.cc
@@ -19,6 +19,7 @@
  */
 
 #include "he-capabilities.h"
+#include <algorithm>
 
 namespace ns3 {
 
@@ -499,7 +500,7 @@ HeCapabilities::GetHighestNssSupported (void) const
 uint32_t
 HeCapabilities::GetMaxAmpduLength (void) const
 {
-  return (1ul << (20 + m_maxAmpduLengthExponent)) - 1;
+  return std::min<uint32_t> ((1ul << (20 + m_maxAmpduLengthExponent)) - 1, 6500631);
 }
 
 std::ostream &