diff --git a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
index e35daf09d490c2ecfaa5880b4378febbd984226a..8a266fc366615a2e7603de4497c2aaa49be11c07 100755
--- a/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
+++ b/Trigger/TrigAlgorithms/TrigFastTrackFinder/python/TrigFastTrackFinder_Config.py
@@ -372,6 +372,11 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
             nClustersMin = config.nClustersMin
         else:
             nClustersMin = TrackingCuts.minClusters()
+        
+        if config.Xi2max is not None:
+            Xi2max = config.Xi2max
+        else:
+            Xi2max = TrackingCuts.Xi2max()
 
         TrackMaker_FTF = InDet__SiTrackMaker_xk(name = 'InDetTrigSiTrackMaker_FTF_'+slice_name,
                                               RoadTool       = InDetTrigSiDetElementsRoadMaker_FTF,
@@ -381,10 +386,10 @@ class TrigFastTrackFinderBase(TrigFastTrackFinder):
                                               nHolesMax      = TrackingCuts.nHolesMax(),
                                               nHolesGapMax   = TrackingCuts.nHolesGapMax(),
                                               SeedsFilterLevel = 0, # Do not use built-in seeds filter
-                                              Xi2max         = TrackingCuts.Xi2max(),
+                                              Xi2max         = Xi2max,
                                               Xi2maxNoAdd    = TrackingCuts.Xi2maxNoAdd(),
                                               nWeightedClustersMin= TrackingCuts.nWeightedClustersMin(),
-                                              Xi2maxMultiTracks         = TrackingCuts.Xi2max(),
+                                              Xi2maxMultiTracks         = Xi2max,
                                               UseAssociationTool       = False)
 
         from InDetTrigRecExample.InDetTrigFlags import InDetTrigFlags
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py
index 89d14267d474d796f2ce3e6e5c1d30047f34c6e4..8dadeeb7c7658e103a8cfc7999c184647c0d36a8 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/ConfigSettingsBase.py
@@ -16,6 +16,7 @@ class _ConfigSettingsBase() :
       self._name                = None
       self._suffix              = None
       self._pTmin               = 1.*GeV
+      self._Xi2max              = None
       self._newConfig           = True
       self._TripletDoPPS        = True
       self._Triplet_D0Max       = 4.0
@@ -137,6 +138,10 @@ class _ConfigSettingsBase() :
    def pTmin(self):
       return self._pTmin
 
+   @property
+   def Xi2max(self):
+      return self._Xi2max
+
    @property
    def newConfig(self):
       return self._newConfig
@@ -398,6 +403,7 @@ class _ConfigSettingsBase() :
       log.info( " %s :", self._name )
       log.info( " %s :", self._input_name )
       log.info( "   pTmin                 : %s", self._pTmin )
+      log.info( "   Xi2max                : %s", self._Xi2max )
       log.info( "   TripletDoPPS          : %s", self._TripletDoPPS )
       log.info( "   Triplet_D0Max         : %s", self._Triplet_D0Max )
       log.info( "   Triplet_D0_PPS_Max    : %s", self._Triplet_D0_PPS_Max )
diff --git a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py
index 7316b6f429e8fe029b943dfb6c8fbccd1f179641..766ab31f95ed358188eda075e8f68d09e53fca6a 100644
--- a/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py
+++ b/Trigger/TrigTools/TrigInDetConfig/python/TrigTrackingPassFlags.py
@@ -13,10 +13,14 @@ def __flagsFromConfigSettings(settings):
     flags = createTrackingPassFlags()
     for setting, value in settings.__dict__.items():
         setting = setting.lstrip("_")
-        if value is None:
-            flags.addFlag(setting, lambda pf: None)
+        if setting in flags._flagdict:
+            if value is not None: 
+                flags._flagdict[setting] = value
         else:
-            flags.addFlag(setting, value)
+            if value is None: 
+                flags.addFlag(setting, lambda pf: None)
+            else:
+                flags.addFlag(setting, value)
 
     flags.addFlag("trkTracks_FTF", f'HLT_IDTrkTrack_{flags.suffix}_FTF')
     flags.addFlag("tracks_FTF", f'HLT_IDTrack_{flags.suffix}_FTF')