diff --git a/src/wifi/model/wifi-phy-common.cc b/src/wifi/model/wifi-phy-common.cc
index 5a13d38d3..8e8632e93 100644
--- a/src/wifi/model/wifi-phy-common.cc
+++ b/src/wifi/model/wifi-phy-common.cc
@@ -249,15 +249,15 @@ GetSupportedChannelWidthSet(WifiStandard standard, WifiPhyBand band)
     case WIFI_STANDARD_80211ac:
         return {MHz_u{80}, MHz_u{160}};
     case WIFI_STANDARD_80211ax:
-        return (band == WifiPhyBand::WIFI_PHY_BAND_2_4GHZ) ? std::set<MHz_u>{MHz_u{20}, MHz_u{40}}
-                                                           : std::set<MHz_u>{MHz_u{80}, MHz_u{160}};
+        return (band == WifiPhyBand::WIFI_PHY_BAND_2_4GHZ)
+                   ? std::set<MHz_u>{MHz_u{20}, MHz_u{40}}
+                   : std::set<MHz_u>{MHz_u{20}, MHz_u{80}, MHz_u{160}};
     case WIFI_STANDARD_80211be:
         switch (band)
         {
         case WifiPhyBand::WIFI_PHY_BAND_2_4GHZ:
             return {MHz_u{20}, MHz_u{40}};
         case WifiPhyBand::WIFI_PHY_BAND_5GHZ:
-            return {MHz_u{80}, MHz_u{160}};
         case WifiPhyBand::WIFI_PHY_BAND_6GHZ:
             return {MHz_u{20}, MHz_u{80}, MHz_u{160}};
         default:
diff --git a/src/wifi/model/wifi-remote-station-manager.cc b/src/wifi/model/wifi-remote-station-manager.cc
index 13701245b..62bcff541 100644
--- a/src/wifi/model/wifi-remote-station-manager.cc
+++ b/src/wifi/model/wifi-remote-station-manager.cc
@@ -1684,6 +1684,10 @@ WifiRemoteStationManager::AddStationHeCapabilities(Mac48Address from,
         {
             state->m_channelWidth = MHz_u{80};
         }
+        else if (heCapabilities.GetChannelWidthSet() == 0x00)
+        {
+            state->m_channelWidth = MHz_u{20};
+        }
         // For other cases at 5 GHz, the supported channel width is set by the VHT capabilities
     }
     else if (m_wifiPhy->GetPhyBand() == WIFI_PHY_BAND_2_4GHZ)
diff --git a/src/wifi/test/wifi-aggregation-test.cc b/src/wifi/test/wifi-aggregation-test.cc
index 649e4a370..929e091a6 100644
--- a/src/wifi/test/wifi-aggregation-test.cc
+++ b/src/wifi/test/wifi-aggregation-test.cc
@@ -313,6 +313,7 @@ AmpduAggregationTest::DoSetup()
         if (m_params.standard >= WIFI_STANDARD_80211ax)
         {
             HeCapabilities heCapabilities;
+            heCapabilities.SetChannelWidthSet(0x1);
             heCapabilities.SetMaxAmpduLength((1 << 23) - 1);
             m_managers.at(i)->AddStationHeCapabilities(Mac48Address("00:00:00:00:00:02"),
                                                        heCapabilities);