diff --git a/Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp b/Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp
index 7156160a6064..34dabcd343de 100644
--- a/Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp
+++ b/Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp
@@ -982,6 +982,8 @@ class CombinatorialKalmanFilter {
           typeFlags.set(TrackStateFlag::MeasurementFlag);
           // Increment number of measurements
           newBranch.nMeasurements()++;
+          newBranch.nDoF() += trackState.calibratedSize();
+          newBranch.chi2() += trackState.chi2();
         } else {
           ACTS_WARNING("Cannot handle this track state flags");
           continue;
@@ -1330,10 +1332,6 @@ class CombinatorialKalmanFilter {
       return error.error();
     }
 
-    for (const auto& track : combKalmanResult.collectedTracks) {
-      calculateTrackQuantities(track);
-    }
-
     return std::move(combKalmanResult.collectedTracks);
   }
 };