diff --git a/core/include/traccc/edm/track_state.hpp b/core/include/traccc/edm/track_state.hpp
index 7e6833e014..26d0776bc7 100644
--- a/core/include/traccc/edm/track_state.hpp
+++ b/core/include/traccc/edm/track_state.hpp
@@ -91,6 +91,10 @@ struct track_state {
             assert(
                 "The measurement index out of e_bound_loc0 and e_bound_loc1 "
                 "should not happen.");
+            matrix_operator().element(ret, 0, 0) = m_measurement.local[0];
+            if constexpr (D == 2u) {
+                matrix_operator().element(ret, 1, 0) = m_measurement.local[1];
+            }
         }
 
         return ret;
@@ -126,6 +130,13 @@ struct track_state {
             assert(
                 "The measurement index out of e_bound_loc0 and e_bound_loc1 "
                 "should not happen.");
+            matrix_operator().element(ret, 0, 0) = m_measurement.variance[0];
+            if constexpr (D == 2u) {
+                matrix_operator().element(ret, 0, 1) = 0.f;
+                matrix_operator().element(ret, 1, 0) = 0.f;
+                matrix_operator().element(ret, 1, 1) =
+                    m_measurement.variance[1];
+            }
         }
         return ret;
     }