diff --git a/src/wifi/model/he/he-phy.h b/src/wifi/model/he/he-phy.h
index dba706432..b990f9c95 100644
--- a/src/wifi/model/he/he-phy.h
+++ b/src/wifi/model/he/he-phy.h
@@ -38,7 +38,7 @@ namespace ns3 {
 /**
  * This defines the BSS membership value for HE PHY.
  */
-#define HE_PHY 125
+#define HE_PHY 122
 
 /**
  * Parameters for received HE-SIG-A for OBSS_PD based SR
diff --git a/src/wifi/model/supported-rates.cc b/src/wifi/model/supported-rates.cc
index 9acf5e98e..a41d1f3d9 100644
--- a/src/wifi/model/supported-rates.cc
+++ b/src/wifi/model/supported-rates.cc
@@ -27,7 +27,8 @@ NS_LOG_COMPONENT_DEFINE ("SupportedRates");
 
 #define BSS_MEMBERSHIP_SELECTOR_HT_PHY 127
 #define BSS_MEMBERSHIP_SELECTOR_VHT_PHY 126
-#define BSS_MEMBERSHIP_SELECTOR_HE_PHY 125
+#define BSS_MEMBERSHIP_SELECTOR_HE_PHY 122
+#define BSS_MEMBERSHIP_SELECTOR_EHT_PHY 121  // TODO not defined yet as of 802.11be D1.4
 
 SupportedRates::SupportedRates ()
   : extended (this),
@@ -98,8 +99,9 @@ SupportedRates::AddBssMembershipSelectorRate (uint64_t bs)
 {
   NS_LOG_FUNCTION (this << bs);
   NS_ASSERT_MSG (bs == BSS_MEMBERSHIP_SELECTOR_HT_PHY ||
- 	         bs == BSS_MEMBERSHIP_SELECTOR_VHT_PHY ||
- 	         bs == BSS_MEMBERSHIP_SELECTOR_HE_PHY,
+ 	               bs == BSS_MEMBERSHIP_SELECTOR_VHT_PHY ||
+                 bs == BSS_MEMBERSHIP_SELECTOR_HE_PHY ||
+                 bs == BSS_MEMBERSHIP_SELECTOR_EHT_PHY,
                  "Value " << bs << " not a BSS Membership Selector");
   uint8_t rate = static_cast<uint8_t> (bs / 500000);
   for (uint8_t i = 0; i < m_nRates; i++)
@@ -151,7 +153,8 @@ SupportedRates::IsBssMembershipSelectorRate (uint64_t bs) const
   NS_LOG_FUNCTION (this << bs);
   if ((bs & 0x7f) == BSS_MEMBERSHIP_SELECTOR_HT_PHY
       || (bs & 0x7f) == BSS_MEMBERSHIP_SELECTOR_VHT_PHY
-      || (bs & 0x7f) == BSS_MEMBERSHIP_SELECTOR_HE_PHY)
+      || (bs & 0x7f) == BSS_MEMBERSHIP_SELECTOR_HE_PHY
+      || (bs & 0x7f) == BSS_MEMBERSHIP_SELECTOR_EHT_PHY)
     {
       return true;
     }