diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py
index 91fdbe256f90da6c8c535b4137e44f25e6a7a69d..26eee7ca92f8e5f67e505db04f116a708ef19478 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerRecoConfig.py
@@ -49,14 +49,6 @@ def TriggerRecoCfg(flags):
     elif flags.Trigger.EDMVersion in [1, 2]:
         acc.merge( Run1Run2BSExtractionCfg(flags) )
 
-        from AnalysisTriggerAlgs.AnalysisTriggerAlgsCAConfig import RoIBResultToxAODCfg
-        xRoIBResultAcc, _ = RoIBResultToxAODCfg(flags)
-        acc.merge( xRoIBResultAcc )
-
-        if flags.Input.Format is Format.BS:
-            from L1TopoByteStream.L1TopoByteStreamConfig import L1TopoRawDataContainerBSCnvCfg
-            acc.merge( L1TopoRawDataContainerBSCnvCfg(flags) )
-
         from TrigDecisionMaker.TrigDecisionMakerConfig import Run1Run2DecisionMakerCfg
         acc.merge (Run1Run2DecisionMakerCfg(flags) )
 
@@ -65,6 +57,16 @@ def TriggerRecoCfg(flags):
     else:
         raise RuntimeError("Invalid EDMVersion=%s " % flags.Trigger.EDMVersion)
 
+    # Legacy L1Calo, L1Topo reco
+    if flags.Trigger.enableL1CaloLegacy:
+        from AnalysisTriggerAlgs.AnalysisTriggerAlgsCAConfig import RoIBResultToxAODCfg
+        xRoIBResultAcc, _ = RoIBResultToxAODCfg(flags)
+        acc.merge( xRoIBResultAcc )
+
+        if flags.Input.Format is Format.BS:
+            from L1TopoByteStream.L1TopoByteStreamConfig import L1TopoRawDataContainerBSCnvCfg
+            acc.merge( L1TopoRawDataContainerBSCnvCfg(flags) )
+
     if flags.Output.doWriteESD or flags.Output.doWriteAOD:
         acc.merge(TriggerEDMCfg(flags))