diff --git a/CI/physmon/reference/performance_ambi_ttbar.root b/CI/physmon/reference/performance_ambi_ttbar.root
index aeb519f3d35..2dd55c52b42 100644
Binary files a/CI/physmon/reference/performance_ambi_ttbar.root and b/CI/physmon/reference/performance_ambi_ttbar.root differ
diff --git a/CI/physmon/reference/performance_amvf_gridseeder_ttbar_hist.root b/CI/physmon/reference/performance_amvf_gridseeder_ttbar_hist.root
index 3ac09b4071d..312055b4dfc 100644
Binary files a/CI/physmon/reference/performance_amvf_gridseeder_ttbar_hist.root and b/CI/physmon/reference/performance_amvf_gridseeder_ttbar_hist.root differ
diff --git a/CI/physmon/reference/performance_amvf_ttbar_hist.root b/CI/physmon/reference/performance_amvf_ttbar_hist.root
index ef9d894ac2c..47d53557498 100644
Binary files a/CI/physmon/reference/performance_amvf_ttbar_hist.root and b/CI/physmon/reference/performance_amvf_ttbar_hist.root differ
diff --git a/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp b/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp
index 39f967b3494..cffdb128220 100644
--- a/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp
+++ b/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp
@@ -1,6 +1,6 @@
 // This file is part of the Acts project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp b/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp
index ee2d14b1564..2f231ff216b 100644
--- a/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp
+++ b/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp
@@ -1,6 +1,6 @@
 // This file is part of the Acts project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp"
+#include "Acts/EventData/TrackStateType.hpp"
 
 #include <unordered_map>
 
@@ -36,7 +37,9 @@ void GreedyAmbiguityResolution::computeInitialState(
     }
     std::vector<std::size_t> measurements;
     for (auto ts : track.trackStatesReversed()) {
-      if (ts.typeFlags().test(Acts::TrackStateFlag::MeasurementFlag)) {
+      bool isMeasurement = ts.typeFlags().test(TrackStateFlag::MeasurementFlag);
+      bool isOutlier = ts.typeFlags().test(TrackStateFlag::OutlierFlag);
+      if (isMeasurement && !isOutlier) {
         SourceLink sourceLink = ts.getUncalibratedSourceLink();
         // assign a new measurement index if the source link was not seen yet
         auto emplace = measurementIndexMap.try_emplace(
diff --git a/Core/src/AmbiguityResolution/GreedyAmbiguityResolution.cpp b/Core/src/AmbiguityResolution/GreedyAmbiguityResolution.cpp
index 73f4a65d974..73a94da94a2 100644
--- a/Core/src/AmbiguityResolution/GreedyAmbiguityResolution.cpp
+++ b/Core/src/AmbiguityResolution/GreedyAmbiguityResolution.cpp
@@ -1,6 +1,6 @@
 // This file is part of the Acts project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this