diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
index cdadeac3f06a0218d9744634f28a08931d4aa6e5..0b1f38d1ae3af6395943105db4d016f598b4cb3a 100755
--- a/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/python/TrigMuonEFConfig.py
@@ -542,6 +542,41 @@ class TrigMuonEFTrackIsolationConfig (TrigMuonEFTrackIsolation):
         self.AthenaMonTools = [ validation_trkiso, online_trkiso ]
 
 
+class TrigMuonEFMSTrackIsolationConfig (TrigMuonEFTrackIsolation):
+    __slots__ = ()
+
+    def __init__( self, name="TrigMuonEFMSTrackIsolationConfig" ):
+        super( TrigMuonEFMSTrackIsolationConfig, self ).__init__( name )
+
+        # configure the isolation tool
+        TMEF_IsolationTool = TrigMuonEFTrackIsolationTool(name = 'TMEF_IsolationTool',
+                                                 deltaZCut = 6.0*mm, 
+                                                 removeSelf=True,
+                                                 useAnnulus=False,
+						 useVarIso=False) 
+
+        # Isolation tool
+        self.IsolationTool = TMEF_IsolationTool
+
+        # ID tracks
+        #self.IdTrackParticles = "InDetTrigParticleCreation_FullScan_EFID"
+        #self.IdTrackParticles = "InDetTrigParticleCreation_MuonIso_EFID"
+        self.IdTrackParticles = "InDetTrigTrackingxAODCnv_Muon_IDTrig"
+
+        # Only run algo on combined muons
+        self.requireCombinedMuon = False
+
+        # Use offline isolation variables
+        self.useVarIso = False
+
+        # histograms
+        self.histoPathBase = ""
+        validation_trkiso = TrigMuonEFTrackIsolationValidationMonitoring()
+        online_trkiso     = TrigMuonEFTrackIsolationOnlineMonitoring()
+
+        self.AthenaMonTools = [ validation_trkiso, online_trkiso ]
+
+
 class TrigMuonEFTrackIsolationVarConfig (TrigMuonEFTrackIsolation):
     __slots__ = ()
 
diff --git a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFTrackIsolation.cxx b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFTrackIsolation.cxx
index 91b12923c5387bd8606b7f34074b2e434d1fad17..6daf1dec00376470978a7572f8fef6d68ad14b0e 100644
--- a/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFTrackIsolation.cxx
+++ b/Trigger/TrigAlgorithms/TrigMuonEF/src/TrigMuonEFTrackIsolation.cxx
@@ -248,6 +248,19 @@ TrigMuonEFTrackIsolation::hltExecute(const HLT::TriggerElement* inputTE, HLT::Tr
 	  }
 	  continue;
 	}//requireCombined
+	else{
+	  if( muontype == xAOD::Muon::MuonType::MuonStandAlone ){
+	    if(m_debug) {
+	      msg() << MSG::DEBUG << "EF muon has standalone muon" << endmsg;
+	    }
+	  }
+	  else{
+	    if(m_debug) {
+	      msg() << MSG::DEBUG << "EF muon has neither combined, segment tagged, nor standalone muon" << endmsg;
+	    }
+	    continue;
+	  }
+	}
       }//no combined muon
     
       std::vector<double> isoResults;