diff --git a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetCandidateAlg.cxx b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetCandidateAlg.cxx
index d8ac1397b87b62c0a5c0d348918a0e38e05acd44..36d8095c5900d21136461da32c09016e12a27bdb 100644
--- a/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetCandidateAlg.cxx
+++ b/Reconstruction/MuonIdentification/MuonCombinedAlgs/src/MuonCombinedInDetCandidateAlg.cxx
@@ -22,10 +22,10 @@ MuonCombinedInDetCandidateAlg::MuonCombinedInDetCandidateAlg(const std::string&
 StatusCode
 MuonCombinedInDetCandidateAlg::initialize()
 {
-    ATH_CHECK(m_trackSelector.retrieve());
+    ATH_CHECK(m_trackSelector.retrieve(DisableTool{m_trackSelector.empty()}));
     ATH_CHECK(m_muonSystemExtensionTool.retrieve());
     ATH_CHECK(m_indetTrackParticleLocation.initialize());
-    ATH_CHECK(m_indetForwardTrackParticleLocation.initialize());
+    ATH_CHECK(m_indetForwardTrackParticleLocation.initialize(m_doSiliconForwardMuons));
     ATH_CHECK(m_candidateCollectionName.initialize());
 
     ATH_CHECK(m_forwardTrackSelector.retrieve(DisableTool{!m_doSiliconForwardMuons}));
@@ -88,7 +88,9 @@ MuonCombinedInDetCandidateAlg::create(const ToolHandle<Trk::ITrackSelectorTool>&
 
     for (auto* tp : indetTrackParticles) {
         ++trackIndex;
-        if (!isValidTrackParticle(currentTrackSelector, tp)) continue;
+	if(!currentTrackSelector.empty()){
+	  if (!isValidTrackParticle(currentTrackSelector, tp)) continue;
+	}
 
         ElementLink<xAOD::TrackParticleContainer> link(indetTrackParticles, trackIndex);
         if (!link.isValid()) {
diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
index 2060d7418e7358f86c29c77b89bf4ac6c007ff84..ffda72647debcb3619b6f8dd4c7e1d311d3589e4 100644
--- a/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
+++ b/Trigger/TrigValidation/TrigAnalysisTest/share/ref_RDOtoRDOTrig_v1Dev_build.ref
@@ -632,8 +632,8 @@ TrigSignatureMoniMT                                 INFO HLT_mu6_mu4_L12MU4 #171
 TrigSignatureMoniMT                                 INFO -- #1713982776 Events         4          4          0          0          0          0          3          3          2          2          -          -          -          -          -          2
 TrigSignatureMoniMT                                 INFO -- #1713982776 Features                             0          0          0          0          6          6          4          4          -          -          -          -          -
 TrigSignatureMoniMT                                 INFO HLT_mu6_mu6noL1_L1MU6 #451489897
-TrigSignatureMoniMT                                 INFO -- #451489897 Events          10         10         0          0          0          0          10         10         10         10         0          0          0          5          3          3
-TrigSignatureMoniMT                                 INFO -- #451489897 Features                              0          0          0          0          13         12         13         13         0          0          0          7          5
+TrigSignatureMoniMT                                 INFO -- #451489897 Events          10         10         0          0          0          0          10         10         10         10         0          0          0          5          4          4
+TrigSignatureMoniMT                                 INFO -- #451489897 Features                              0          0          0          0          13         12         13         13         0          0          0          7          6
 TrigSignatureMoniMT                                 INFO HLT_mu6fast_L1MU6 #3518031697
 TrigSignatureMoniMT                                 INFO -- #3518031697 Events         10         10         0          0          0          0          10         -          -          -          -          -          -          -          -          10
 TrigSignatureMoniMT                                 INFO -- #3518031697 Features                             0          0          0          0          13         -          -          -          -          -          -          -          -
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
index c3a100c8171684b178d6146380fce23c79210901..c638bde29a222f6c80bc037f731f279c0bf3d3e3 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Muon/MuonSetup.py
@@ -737,8 +737,8 @@ def muEFCBRecoSequence( RoIs, name ):
   trackParticles = PTTrackParticles[-1]
 
   #Make InDetCandidates
-  theIndetCandidateAlg = MuonCombinedInDetCandidateAlg("TrigMuonCombinedInDetCandidateAlg_"+name,TrackParticleLocation = [trackParticles],ForwardParticleLocation=trackParticles, 
-                                                       InDetCandidateLocation="InDetCandidates_"+name)
+  theIndetCandidateAlg = MuonCombinedInDetCandidateAlg("TrigMuonCombinedInDetCandidateAlg_"+name,TrackParticleLocation = [trackParticles], 
+                                                       InDetCandidateLocation="InDetCandidates_"+name, TrackSelector="")
   #No easy way to access AtlasHoleSearchTool in theIndetCandidateAlg
   from AthenaCommon.AppMgr import ToolSvc
   from InDetTrigRecExample.InDetTrigConditionsAccess import SCT_ConditionsSetup