diff --git a/examples/wireless/examples-to-run.py b/examples/wireless/examples-to-run.py
index 8a8ef09ed..091452f06 100755
--- a/examples/wireless/examples-to-run.py
+++ b/examples/wireless/examples-to-run.py
@@ -225,7 +225,7 @@ cpp_examples = [
         "True",
     ),
     (
-        "wifi-eht-network --simulationTime=0.3s --frequency=2.4 --frequency2=5 --frequency3=6 --guardInterval=1600 --udp=0 --downlink=0 --useRts=1 --mpduBufferSize=512 --emlsrLinks=0,1,2 --emlsrPaddingDelay=0 --emlsrTransitionDelay=0 --channelSwitchDelay=1ns --emlsrMgrTypeId=ns3::AdvancedEmlsrManager --emlsrAuxSwitch=False --emlsrAuxTxCapable=False --nStations=4 --dlAckType=ACK-SU-FORMAT --enableUlOfdma=1 --enableBsrp=1 --mcs=1,5,8,11 --minExpectedThroughput=8 --maxExpectedThroughput=88",
+        "wifi-eht-network --simulationTime=0.3s --frequency=2.4 --frequency2=5 --frequency3=6 --guardInterval=1600 --udp=0 --downlink=0 --useRts=1 --mpduBufferSize=512 --emlsrLinks=0,1,2 --emlsrPaddingDelay=0 --emlsrTransitionDelay=0 --channelSwitchDelay=1ns --emlsrMgrTypeId=ns3::AdvancedEmlsrManager --emlsrAuxSwitch=False --emlsrAuxTxCapable=False --nStations=4 --dlAckType=ACK-SU-FORMAT --enableUlOfdma=1 --enableBsrp=1 --mcs=1,5,8,11 --minExpectedThroughput=8 --maxExpectedThroughput=288 --RngRun=5",
         "True",
         "True",
     ),
diff --git a/src/wifi/model/eht/advanced-emlsr-manager.cc b/src/wifi/model/eht/advanced-emlsr-manager.cc
index 2cb1ae107..41182b92f 100644
--- a/src/wifi/model/eht/advanced-emlsr-manager.cc
+++ b/src/wifi/model/eht/advanced-emlsr-manager.cc
@@ -928,13 +928,16 @@ AdvancedEmlsrManager::SwitchMainPhyIfTxopToBeGainedByAuxPhy(uint8_t linkId,
                   DONT_REQUEST_ACCESS,
                   EmlsrUlTxopAuxPhyNotTxCapableTrace(aci, delay, remNav));
 
-    // if the remaining backoff time is shorter than PIFS when the main PHY completes the switch,
-    // we need to schedule a CCA check a PIFS after the end of the main PHY switch
+    // check expected channel access delay when switch is completed
     Simulator::Schedule(mainPhy->GetChannelSwitchDelay(), [=, this]() {
         const auto edca = GetStaMac()->GetQosTxop(aci);
         const auto pifs = GetStaMac()->GetWifiPhy(linkId)->GetPifs();
-        if (GetStaMac()->GetChannelAccessManager(linkId)->GetBackoffEndFor(edca) <=
-            Simulator::Now() + pifs)
+        // if the remaining backoff time is shorter than PIFS when the main PHY completes the
+        // switch, we need to schedule a CCA check a PIFS after the end of the main PHY switch
+        if (const auto accessDelay =
+                GetStaMac()->GetChannelAccessManager(linkId)->GetBackoffEndFor(edca) -
+                Simulator::Now();
+            accessDelay <= pifs)
         {
             // use main PHY CCA in the last PIFS interval after main PHY switch end
             NS_LOG_DEBUG("Schedule CCA check a PIFS after the end of main PHY switch");
@@ -945,20 +948,26 @@ AdvancedEmlsrManager::SwitchMainPhyIfTxopToBeGainedByAuxPhy(uint8_t linkId,
                                                 linkId,
                                                 edca);
         }
+        else if (!GetExpectedAccessWithinDelay(linkId,
+                                               accessDelay + m_switchMainPhyBackDelay +
+                                                   mainPhy->GetChannelSwitchDelay()))
+        {
+            NS_LOG_DEBUG("No AC is expected to get backoff soon, switch main PHY back");
+            SwitchMainPhyBackDelayExpired(linkId);
+        }
+        else
+        {
+            // the main PHY must stay for some time on this link to check if it gets channel access.
+            // The timer is stopped if a DL or UL TXOP is started. When the timer expires, the main
+            // PHY switches back to the preferred link if SwitchAuxPhy is false
+            m_switchMainPhyBackEvent.Cancel();
+            m_switchMainPhyBackEvent =
+                Simulator::Schedule(accessDelay + m_switchMainPhyBackDelay,
+                                    &AdvancedEmlsrManager::SwitchMainPhyBackDelayExpired,
+                                    this,
+                                    linkId);
+        }
     });
-
-    // the main PHY must stay for some time on this link to check if it gets channel access.
-    // The timer is stopped if a DL or UL TXOP is started. When the timer expires, the main PHY
-    // switches back to the preferred link if SwitchAuxPhy is false
-    const auto minDelay =
-        std::max(delay,
-                 mainPhy->GetChannelSwitchDelay() + GetStaMac()->GetWifiPhy(linkId)->GetPifs());
-    m_switchMainPhyBackEvent.Cancel();
-    m_switchMainPhyBackEvent =
-        Simulator::Schedule(minDelay + m_switchMainPhyBackDelay,
-                            &AdvancedEmlsrManager::SwitchMainPhyBackDelayExpired,
-                            this,
-                            linkId);
 }
 
 } // namespace ns3