diff --git a/src/lte/helper/radio-bearer-stats-calculator.cc b/src/lte/helper/radio-bearer-stats-calculator.cc
index fc0c77249..e5eab5857 100644
--- a/src/lte/helper/radio-bearer-stats-calculator.cc
+++ b/src/lte/helper/radio-bearer-stats-calculator.cc
@@ -295,10 +295,8 @@ RadioBearerStatsCalculator::WriteUlResults (std::ofstream& outFile)
     {
       ImsiLcidPair_t p = *it;
       FlowIdMap::const_iterator flowIdIt = m_flowId.find (p);
-      // \TODO Temporary workaround until traces are connected correctly in LteEnbRrc and LteUeRrc
-      if (flowIdIt == m_flowId.end ()) continue;
-//       NS_ASSERT_MSG (flowIdIt != m_flowId.end (),
-//                      "FlowId (imsi " << p.m_imsi << " lcid " << (uint32_t) p.m_lcId << ") is missing");
+      NS_ASSERT_MSG (flowIdIt != m_flowId.end (),
+                     "FlowId (imsi " << p.m_imsi << " lcid " << (uint32_t) p.m_lcId << ") is missing");
       LteFlowId_t flowId = flowIdIt->second;
       NS_ASSERT_MSG (flowId.m_lcId == p.m_lcId, "lcid mismatch");
 
@@ -356,10 +354,8 @@ RadioBearerStatsCalculator::WriteDlResults (std::ofstream& outFile)
     {
       ImsiLcidPair_t p = *pair;
       FlowIdMap::const_iterator flowIdIt = m_flowId.find (p);
-      // \TODO Temporary workaround until traces are connected correctly in LteEnbRrc and LteUeRrc
-      if (flowIdIt == m_flowId.end ()) continue;
-//       NS_ASSERT_MSG (flowIdIt != m_flowId.end (),
-//                      "FlowId (imsi " << p.m_imsi << " lcid " << (uint32_t) p.m_lcId << ") is missing");
+      NS_ASSERT_MSG (flowIdIt != m_flowId.end (),
+                     "FlowId (imsi " << p.m_imsi << " lcid " << (uint32_t) p.m_lcId << ") is missing");
       LteFlowId_t flowId = flowIdIt->second;
       NS_ASSERT_MSG (flowId.m_lcId == p.m_lcId, "lcid mismatch");