diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/python/MuonDQAMonitoringConfig.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/python/MuonDQAMonitoringConfig.py
index 3120285fc856a7e4604a3a7b316e026f7e1e02e9..631bb29d22ae6422ad3ca11ba03475fb80d80f63 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/python/MuonDQAMonitoringConfig.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/python/MuonDQAMonitoringConfig.py
@@ -2,24 +2,24 @@
 #  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 #
 def MuonDQAMonitoringConfig(flags):
-    print("entering muon daq")
 
     from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
 
     result = ComponentAccumulator()
 
-    if flags.DQ.Steering.Muon.doRawMon and False:
+    if flags.DQ.Steering.Muon.doRawMon:
         # do not run in RAW->ESD, or AOD-only
         if flags.DQ.Environment not in ('tier0Raw', 'AOD'):
             from MdtRawDataMonitoring.MDTMonitorAlgorithm import MdtMonitoringConfig
             from RpcRawDataMonitoring.RpcMonitorAlgorithm import RpcMonitoringConfig
+            from TgcRawDataMonitoring.TgcRawDataMonitorAlgorithm import TgcRawDataMonitoringConfig
             result.merge(MdtMonitoringConfig(flags))
             result.merge(RpcMonitoringConfig(flags))
-
-        from TgcRawDataMonitoring.TgcRawDataMonitorAlgorithm import TgcRawDataMonitoringConfig
-        result.merge(TgcRawDataMonitoringConfig(flags))
+            result.merge(TgcRawDataMonitoringConfig(flags))
 
     if flags.DQ.Steering.Muon.doTrackMon:
-        from MuonTrackMonitoring.MuonTrackMonitorAlgorithm import MuonTrackConfig
-        result.merge(MuonTrackConfig(flags))
+        # do not run in RAW->ESD
+        if flags.DQ.Environment not in ('tier0Raw',):
+            from MuonTrackMonitoring.MuonTrackMonitorAlgorithm import MuonTrackConfig
+            result.merge(MuonTrackConfig(flags))
     return result
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py
index ae01ee5ff721c392090f227db20b86cfc7cc54a1..575c4422d28c5211977c28f706adf98030a7fec3 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonDQAMonitoring/share/MuonDetMonitoring.py
@@ -161,6 +161,16 @@ if DQMonFlags.doMuonSegmentMon():
     except Exception:
         treatException("DataQualitySteering_jobOptions.py: exception when setting up Muon CSC segment monitoring")
 
+#------------- ---------#
+# Muon track monitoring #
+#------------- ---------#
+if DQMonFlags.doMuonTrackMon():
+    if MuonESDMon:
+        try:
+            from MuonTrackMonitoring.MuonTrackMonitorAlgorithm import MuonTrackConfig
+            topSequence += MuonTrackConfig(DQMonFlags,isOld=True)
+        except Exception:
+            treatException("DataQualitySteering_jobOptions.py: exception when setting up Muon track monitoring")
 
 #-------------------------#
 # Muon physics monitoring #
diff --git a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py
index d5076493f3e724b5c025356f18479decb617cde9..8cf79208e68665ff7a45bd2cbfe296cb4be3baeb 100644
--- a/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py
+++ b/MuonSpectrometer/MuonValidation/MuonDQA/MuonTrackMonitoring/python/MuonTrackMonitorAlgorithm.py
@@ -4,12 +4,18 @@
 """
 
 
-def MuonTrackConfig(inputFlags):
-    from AthenaMonitoring import AthMonitorCfgHelper
+def MuonTrackConfig(inputFlags, isOld=False):
+    if isOld:
+        # Run-2 style configuration
+        from AthenaMonitoring import AthMonitorCfgHelperOld as AthMonitorCfgHelper
+        from MuonTrackMonitoring.MuonTrackMonitoringConf import MuonTrackMonitorAlgorithm
+    else:
+        from AthenaMonitoring import AthMonitorCfgHelper
+        from AthenaConfiguration.ComponentFactory import CompFactory
+        MuonTrackMonitorAlgorithm = CompFactory.MuonTrackMonitorAlgorithm
+
     helper = AthMonitorCfgHelper(inputFlags, "MuonTrackMonitoringConfig")
 
-    from AthenaConfiguration.ComponentFactory import CompFactory
-    MuonTrackMonitorAlgorithm = CompFactory.MuonTrackMonitorAlgorithm
     muonTrackAlg = helper.addAlgorithm(MuonTrackMonitorAlgorithm, "MuonTrackMonitorAlgorithmAlg")
 
     myGroup = helper.addGroup(muonTrackAlg, "MuonTrackMonitorAlgorithm", "MuonPhysics/")