diff --git a/HltEfficiencyChecker/python/HltEfficiencyChecker/config.py b/HltEfficiencyChecker/python/HltEfficiencyChecker/config.py
index 166e1eb8bb7921965ac5007196dd26d9cf64a5fd..c51838d9276300f3cf22ec7f95ae256ad306b0c5 100644
--- a/HltEfficiencyChecker/python/HltEfficiencyChecker/config.py
+++ b/HltEfficiencyChecker/python/HltEfficiencyChecker/config.py
@@ -255,6 +255,7 @@ def add_efficiency_tuples(moore_cf, lines, descriptor_template=None):
                     line.objects_to_persist[0].location for line in lines
                 ],
                 Hlt2DecReports=dec_reports.location)
+        use_mctttos = (stage == 1)  # Analysis!807 needed for HLT2
 
     # Want the following tools for both rates and line efficiencies
     tuple_flag = 'MCDecayTreeTuple' if efficiency_mode else 'EventTuple'
@@ -280,9 +281,10 @@ def add_efficiency_tuples(moore_cf, lines, descriptor_template=None):
         mcdtt = _mc_decay_tree_tuple(
             Decay=decay,
             Branches=branches,
-            ToolList=tool_list +
-            [mcttkin.getFullName(),
-             mcttrec.getFullName()] + [mctttos.getFullName()])
+            ToolList=tool_list + [
+                mcttkin.getFullName(),
+                mcttrec.getFullName()
+            ] + ([mctttos.getFullName()] if use_mctttos else []))
         nodes = [
             make_links_lhcbids_mcparticles_tracking_system(),
             make_mc_track_info(), mcdtt