diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index ad4d74ddf..9113b3014 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -27,6 +27,7 @@ New user-visible features
 Bugs fixed
 ----------
 - Bug 1722 - beacons transmitted concurrently
+- Bug 1616 - WifiPhyStateHelper reports false CCA_BUSY times at State trace source
 
 Release 3.18
 =============
diff --git a/src/wifi/model/wifi-phy-state-helper.cc b/src/wifi/model/wifi-phy-state-helper.cc
index 7ba666abd..b90ef7708 100644
--- a/src/wifi/model/wifi-phy-state-helper.cc
+++ b/src/wifi/model/wifi-phy-state-helper.cc
@@ -420,7 +420,10 @@ WifiPhyStateHelper::SwitchMaybeToCcaBusy (Time duration)
     case WifiPhy::TX:
       break;
     }
-  m_startCcaBusy = now;
+  if (GetState () != WifiPhy::CCA_BUSY)
+    {
+      m_startCcaBusy = now;
+    }
   m_endCcaBusy = std::max (m_endCcaBusy, now + duration);
 }