diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc
index bb45e9835..0ae8ab342 100644
--- a/src/wifi/model/ap-wifi-mac.cc
+++ b/src/wifi/model/ap-wifi-mac.cc
@@ -1131,6 +1131,11 @@ ApWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
                             }
                         }
                     }
+                  if (m_htSupported || m_vhtSupported)
+                    {
+                      ExtendedCapabilities extendedCapabilities = assocReq.GetExtendedCapabilities ();
+                      //TODO: to be completed
+                    }
                   if (m_heSupported)
                     {
                       HeCapabilities heCapabilities = assocReq.GetHeCapabilities ();
@@ -1312,6 +1317,11 @@ ApWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
                             }
                         }
                     }
+                  if (m_htSupported || m_vhtSupported)
+                    {
+                      ExtendedCapabilities extendedCapabilities = reassocReq.GetExtendedCapabilities ();
+                      //TODO: to be completed
+                    }
                   if (m_heSupported)
                     {
                       HeCapabilities heCapabilities = reassocReq.GetHeCapabilities ();
diff --git a/src/wifi/model/regular-wifi-mac.cc b/src/wifi/model/regular-wifi-mac.cc
index 57c8a06b3..f79a24b3c 100644
--- a/src/wifi/model/regular-wifi-mac.cc
+++ b/src/wifi/model/regular-wifi-mac.cc
@@ -155,6 +155,7 @@ RegularWifiMac::GetExtendedCapabilities (void) const
           capabilities.SetVhtSupported (1);
         }
     }
+  //TODO: to be completed
   return capabilities;
 }
 
diff --git a/src/wifi/model/sta-wifi-mac.cc b/src/wifi/model/sta-wifi-mac.cc
index beb54e7d9..8eff31bb7 100644
--- a/src/wifi/model/sta-wifi-mac.cc
+++ b/src/wifi/model/sta-wifi-mac.cc
@@ -623,6 +623,11 @@ StaWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
                     }
                 }
             }
+          if (m_htSupported || m_vhtSupported)
+            {
+              ExtendedCapabilities extendedCapabilities = beacon.GetExtendedCapabilities ();
+              //TODO: to be completed
+            }
           if (m_heSupported)
             {
               HeCapabilities heCapabilities = beacon.GetHeCapabilities ();
@@ -895,6 +900,11 @@ StaWifiMac::Receive (Ptr<Packet> packet, const WifiMacHeader *hdr)
                         }
                     }
                 }
+              if (m_htSupported || m_vhtSupported)
+                {
+                  ExtendedCapabilities extendedCapabilities = assocResp.GetExtendedCapabilities ();
+                  //TODO: to be completed
+                }
               if (m_heSupported)
                 {
                   HeCapabilities heCapabilities = assocResp.GetHeCapabilities ();