diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 4171d498d..62e907e05 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -106,6 +106,7 @@ Bugs fixed
 - Bug 2292 - Uninitialized variables since commit 7c60a9f8f271
 - Bug 2293 - Red Queue Estimator spins when trying to compute queue average size under long idle times.
 - Bug 2302 - Fixing RTT calculation inside TCP Socket
+- Bug 2303 - WifiMacQueue::GetSize should cleanup queue beforehand
 
 Known issues
 ------------
diff --git a/src/wifi/model/wifi-mac-queue.cc b/src/wifi/model/wifi-mac-queue.cc
index 516ed9d5c..fed57a333 100644
--- a/src/wifi/model/wifi-mac-queue.cc
+++ b/src/wifi/model/wifi-mac-queue.cc
@@ -221,6 +221,7 @@ WifiMacQueue::IsEmpty (void)
 uint32_t
 WifiMacQueue::GetSize (void)
 {
+  Cleanup ();
   return m_size;
 }