diff --git a/CHANGES.html b/CHANGES.html
index e7de8cffb..2cee77ab3 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -173,6 +173,9 @@ is now exported by WifiNetDevice.</li>
 <li>Queue discs that can operate both in packet mode and byte mode (Red, CoDel, Pie) define their own
     enum QueueDiscMode instead of using QueueBase::QueueMode.
 </li>
+</li>
+  <li> The default value of the <b>EnableBeaconJitter</b> attribute in ApWifiMac was changed from false to true.
+  </li>
 </ul>
 
 <hr>
diff --git a/examples/wireless/80211e-txop.cc b/examples/wireless/80211e-txop.cc
index a2dcc2539..8e3935e95 100644
--- a/examples/wireless/80211e-txop.cc
+++ b/examples/wireless/80211e-txop.cc
@@ -100,7 +100,7 @@ int main (int argc, char *argv[])
   mac.SetType ("ns3::ApWifiMac",
                "QosSupported", BooleanValue (true),
                "Ssid", SsidValue (ssid),
-               "BeaconGeneration", BooleanValue (true));
+               "EnableBeaconJitter", BooleanValue (false));
   apDeviceA = wifi.Install (phy, mac, wifiApNodes.Get (0));
 
   //Network B
@@ -115,7 +115,7 @@ int main (int argc, char *argv[])
   mac.SetType ("ns3::ApWifiMac",
                "QosSupported", BooleanValue (true),
                "Ssid", SsidValue (ssid),
-               "BeaconGeneration", BooleanValue (true));
+               "EnableBeaconJitter", BooleanValue (false));
   apDeviceB = wifi.Install (phy, mac, wifiApNodes.Get (1));
 
   //Modify EDCA configuration (TXOP limit) for AC_BE
@@ -140,7 +140,7 @@ int main (int argc, char *argv[])
   mac.SetType ("ns3::ApWifiMac",
                "QosSupported", BooleanValue (true),
                "Ssid", SsidValue (ssid),
-               "BeaconGeneration", BooleanValue (true));
+               "EnableBeaconJitter", BooleanValue (false));
   apDeviceC = wifi.Install (phy, mac, wifiApNodes.Get (2));
 
   //Network D
@@ -155,7 +155,7 @@ int main (int argc, char *argv[])
   mac.SetType ("ns3::ApWifiMac",
                "QosSupported", BooleanValue (true),
                "Ssid", SsidValue (ssid),
-               "BeaconGeneration", BooleanValue (true));
+               "EnableBeaconJitter", BooleanValue (false));
   apDeviceD = wifi.Install (phy, mac, wifiApNodes.Get (3));
 
   //Modify EDCA configuration (TXOP limit) for AC_VO
diff --git a/examples/wireless/he-wifi-network.cc b/examples/wireless/he-wifi-network.cc
index 9dcd4bfea..88caf382d 100644
--- a/examples/wireless/he-wifi-network.cc
+++ b/examples/wireless/he-wifi-network.cc
@@ -125,6 +125,7 @@ int main (int argc, char *argv[])
               staDevice = wifi.Install (phy, mac, wifiStaNode);
 
               mac.SetType ("ns3::ApWifiMac",
+                           "EnableBeaconJitter", BooleanValue (false),
                            "Ssid", SsidValue (ssid));
 
               NetDeviceContainer apDevice;
diff --git a/examples/wireless/ht-wifi-network.cc b/examples/wireless/ht-wifi-network.cc
index 05778a7cc..216e27097 100644
--- a/examples/wireless/ht-wifi-network.cc
+++ b/examples/wireless/ht-wifi-network.cc
@@ -141,6 +141,7 @@ int main (int argc, char *argv[])
               staDevice = wifi.Install (phy, mac, wifiStaNode);
 
               mac.SetType ("ns3::ApWifiMac",
+                           "EnableBeaconJitter", BooleanValue (false),
                            "Ssid", SsidValue (ssid));
 
               NetDeviceContainer apDevice;
diff --git a/examples/wireless/mixed-network.cc b/examples/wireless/mixed-network.cc
index 6db509596..2b3e94825 100644
--- a/examples/wireless/mixed-network.cc
+++ b/examples/wireless/mixed-network.cc
@@ -193,7 +193,7 @@ Experiment::Run (Parameters params)
   wifi.SetStandard (params.apType);
   mac.SetType ("ns3::ApWifiMac",
                "Ssid", SsidValue (ssid),
-               "BeaconGeneration", BooleanValue (true),
+               "EnableBeaconJitter", BooleanValue (false),
                "BE_MaxAmpduSize", UintegerValue (0),
                "BE_BlockAckThreshold", UintegerValue (2),
                "RifsSupported", BooleanValue (params.rifsSupported),
diff --git a/examples/wireless/mixed-wired-wireless.cc b/examples/wireless/mixed-wired-wireless.cc
index 614f61163..483b1bc7a 100644
--- a/examples/wireless/mixed-wired-wireless.cc
+++ b/examples/wireless/mixed-wired-wireless.cc
@@ -296,7 +296,6 @@ main (int argc, char *argv[])
       // setup ap.
       macInfra.SetType ("ns3::ApWifiMac",
                         "Ssid", SsidValue (ssid),
-                        "BeaconGeneration", BooleanValue (true),
                         "BeaconInterval", TimeValue (Seconds (2.5)));
       NetDeviceContainer apDevices = wifiInfra.Install (wifiPhy, macInfra, backbone.Get (i));
       // Collect all of these new devices
diff --git a/examples/wireless/simple-ht-hidden-stations.cc b/examples/wireless/simple-ht-hidden-stations.cc
index 1cda4194b..f4d2af66d 100644
--- a/examples/wireless/simple-ht-hidden-stations.cc
+++ b/examples/wireless/simple-ht-hidden-stations.cc
@@ -106,7 +106,7 @@ int main (int argc, char *argv[])
 
   mac.SetType ("ns3::ApWifiMac",
                "Ssid", SsidValue (ssid),
-               "BeaconGeneration", BooleanValue (true),
+               "EnableBeaconJitter", BooleanValue (false),
                "BE_MaxAmpduSize", UintegerValue (maxAmpduSize));
 
   NetDeviceContainer apDevice;
diff --git a/examples/wireless/vht-wifi-network.cc b/examples/wireless/vht-wifi-network.cc
index 2d15a28eb..1fbfeaafe 100644
--- a/examples/wireless/vht-wifi-network.cc
+++ b/examples/wireless/vht-wifi-network.cc
@@ -130,6 +130,7 @@ int main (int argc, char *argv[])
               staDevice = wifi.Install (phy, mac, wifiStaNode);
 
               mac.SetType ("ns3::ApWifiMac",
+                           "EnableBeaconJitter", BooleanValue (false),
                            "Ssid", SsidValue (ssid));
 
               NetDeviceContainer apDevice;
diff --git a/examples/wireless/wifi-aggregation.cc b/examples/wireless/wifi-aggregation.cc
index 588b1e28b..35b183fcd 100644
--- a/examples/wireless/wifi-aggregation.cc
+++ b/examples/wireless/wifi-aggregation.cc
@@ -109,7 +109,7 @@ int main (int argc, char *argv[])
 
   mac.SetType ("ns3::ApWifiMac",
                "Ssid", SsidValue (ssid),
-               "BeaconGeneration", BooleanValue (true));
+               "EnableBeaconJitter", BooleanValue (false));
   apDeviceA = wifi.Install (phy, mac, wifiApNodes.Get (0));
 
   //Network B
@@ -123,7 +123,7 @@ int main (int argc, char *argv[])
 
   mac.SetType ("ns3::ApWifiMac",
                "Ssid", SsidValue (ssid),
-               "BeaconGeneration", BooleanValue (true));
+               "EnableBeaconJitter", BooleanValue (false));
   apDeviceB = wifi.Install (phy, mac, wifiApNodes.Get (1));
 
   //Network C
@@ -138,7 +138,7 @@ int main (int argc, char *argv[])
 
   mac.SetType ("ns3::ApWifiMac",
                "Ssid", SsidValue (ssid),
-               "BeaconGeneration", BooleanValue (true));
+               "EnableBeaconJitter", BooleanValue (false));
   apDeviceC = wifi.Install (phy, mac, wifiApNodes.Get (2));
 
   //Network D
@@ -153,7 +153,7 @@ int main (int argc, char *argv[])
 
   mac.SetType ("ns3::ApWifiMac",
                "Ssid", SsidValue (ssid),
-               "BeaconGeneration", BooleanValue (true));
+               "EnableBeaconJitter", BooleanValue (false));
   apDeviceD = wifi.Install (phy, mac, wifiApNodes.Get (3));
 
   /* Setting mobility model */
diff --git a/examples/wireless/wifi-backward-compatibility.cc b/examples/wireless/wifi-backward-compatibility.cc
index 61cc306ee..bbf7caf1d 100644
--- a/examples/wireless/wifi-backward-compatibility.cc
+++ b/examples/wireless/wifi-backward-compatibility.cc
@@ -133,8 +133,7 @@ int main (int argc, char *argv[])
   wifi.SetRemoteStationManager ("ns3::" + apRaa + "WifiManager");
 
   mac.SetType ("ns3::ApWifiMac",
-               "Ssid", SsidValue (ssid),
-               "BeaconGeneration", BooleanValue (true));
+               "Ssid", SsidValue (ssid));
 
   NetDeviceContainer apDevice;
   apDevice = wifi.Install (phy, mac, wifiApNode);
diff --git a/src/wifi/model/ap-wifi-mac.cc b/src/wifi/model/ap-wifi-mac.cc
index c3930bc30..64147d836 100644
--- a/src/wifi/model/ap-wifi-mac.cc
+++ b/src/wifi/model/ap-wifi-mac.cc
@@ -55,7 +55,7 @@ ApWifiMac::GetTypeId (void)
                    MakePointerChecker<UniformRandomVariable> ())
     .AddAttribute ("EnableBeaconJitter",
                    "If beacons are enabled, whether to jitter the initial send event.",
-                   BooleanValue (false),
+                   BooleanValue (true),
                    MakeBooleanAccessor (&ApWifiMac::m_enableBeaconJitter),
                    MakeBooleanChecker ())
     .AddAttribute ("BeaconGeneration",