diff --git a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
index 02757cd4c7d7e0a9943b3610d52f40e856e645c7..f2aa7290dd2c6d738dbe74ebaef9f17e8382b7e8 100644
--- a/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
+++ b/Reconstruction/RecExample/RecExCommon/share/RecExCommon_topOptions.py
@@ -570,24 +570,20 @@ if rec.doTrigger:
 
 #MT part
 ## Outputs
-if rec.readESD() and rec.doAOD():
+if TriggerFlags.doMT() and rec.readESD() and rec.doAOD():
     # Don't run any trigger - only pass the HLT contents from ESD to AOD
-    if TriggerFlags.doMT():
-        # Add HLT output
-        from TriggerJobOpts.HLTTriggerResultGetter import HLTTriggerResultGetter
-        hltOutput = HLTTriggerResultGetter()
-        # Add Trigger menu metadata
-        if rec.doFileMetaData():
-            from RecExConfig.ObjKeyStore import objKeyStore
-            metadataItems = [ "xAOD::TriggerMenuContainer#TriggerMenu",
-                              "xAOD::TriggerMenuAuxContainer#TriggerMenuAux." ]
-            objKeyStore.addManyTypesMetaData( metadataItems )
-        # Add L1 output (to be consistent with R2)
-        from TrigEDMConfig.TriggerEDM import getLvl1AODList
-        objKeyStore.addManyTypesStreamAOD(getLvl1AODList())        
-
-    else: # not TriggerFlags.doMT()
-        pass # See TriggerJobOpts/python/TriggerGetter.py for Run 2. Called by RecExCommon
+    # Add HLT output
+    from TriggerJobOpts.HLTTriggerResultGetter import HLTTriggerResultGetter
+    hltOutput = HLTTriggerResultGetter()
+    # Add Trigger menu metadata
+    if rec.doFileMetaData():
+        from RecExConfig.ObjKeyStore import objKeyStore
+        metadataItems = [ "xAOD::TriggerMenuContainer#TriggerMenu",
+                          "xAOD::TriggerMenuAuxContainer#TriggerMenuAux." ]
+        objKeyStore.addManyTypesMetaData( metadataItems )
+    # Add L1 output (to be consistent with R2)
+    from TrigEDMConfig.TriggerEDM import getLvl1AODList
+    objKeyStore.addManyTypesStreamAOD(getLvl1AODList())        
 
 AODFix_postTrigger()
 
diff --git a/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py b/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py
index 0fe8679097ed8c287db052bf3293db7d688128d8..c2ea42f79279cebd80ece4936debbfe8d2748724 100644
--- a/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py
+++ b/Reconstruction/RecJobTransforms/share/skeleton.ESDtoAOD_tf.py
@@ -63,9 +63,6 @@ if hasattr(runArgs,"outputAODFile"):
         from RecExConfig.RecAlgsFlags import recAlgs
         recAlgs.doTrigger.set_Value_and_Lock( False )
         rec.doTrigger.set_Value_and_Lock( False )
-    else: # not TriggerFlags.doMT()
-        pass
-
 
 if hasattr(runArgs,"outputTAGFile"):
     # should be used as outputTAGFile_e2a=myTAG.root so that it does not trigger AODtoTAG