diff --git a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
index 06c8c51f1692b29a0678dc9bf0dd6923b11495e0..e1fdb3b88d41c522100893bab41860c8bd236d29 100644
--- a/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
+++ b/HLT/Trigger/TrigControl/TrigServices/python/TrigServicesConfig.py
@@ -52,7 +52,7 @@ def setupMessageSvc():
    MessageSvc = svcMgr.MessageSvc
    MessageSvc.OutputLevel = theApp.OutputLevel
 
-   MessageSvc.Format       = "% F%40W%S%4W%R%e%s%8W%R%T %0W%M"
+   MessageSvc.Format       = "% F%40W%C%4W%R%e%s%8W%R%T %0W%M"
    # Add timestamp when running in partition
    if os.environ.get('TDAQ_PARTITION','') != 'athenaHLT':
       MessageSvc.Format = "%t  " + MessageSvc.Format
diff --git a/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py b/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
index 8904eec9b96bbff0a3a90f796577e51d334b2e40..f8ac2b0ecfa752e37ac626f94ee424c74d6dc49d 100644
--- a/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
+++ b/HLT/Trigger/TrigControl/TrigServices/python/TriggerUnixStandardSetup.py
@@ -23,9 +23,6 @@ def setupCommonServices():
     # Create our own logger
     log = logging.getLogger( 'TriggerUnixStandardSetup::setupCommonServices:' )
 
-    from TrigServices.TrigServicesConfig import setupMessageSvc
-    setupMessageSvc()
-     
     # Do the default Atlas job configuration first
     import AthenaCommon.AtlasUnixStandardJob   # noqa: F401
 
@@ -179,6 +176,9 @@ def setupCommonServicesEnd():
     # Set default properties for some important services after all user job options
     log.info('Configure core services for online running')
 
+    from TrigServices.TrigServicesConfig import setupMessageSvc
+    setupMessageSvc()
+
     svcMgr.CoreDumpSvc.CoreDumpStream = "stdout"
     svcMgr.CoreDumpSvc.CallOldHandler = False
     svcMgr.CoreDumpSvc.StackTrace = True
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
index 1ef81f81c0c1dd414a8e2f56762fe74fb4c01877..3ea6726e9574e337e36ffe3e2db53ac1eb777cb3 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/share/runHLT_standalone.py
@@ -504,12 +504,6 @@ if not opt.createHLTMenuExternally:
 
 
 
-#Needed to get full output from TrigSignatureMoniMT with a large menu: see ATR-21487
-#Can be removed once chainDump.py is used instead of log file parsing
-svcMgr.MessageSvc.infoLimit=10000
-
-
-
 from TrigConfigSvc.TrigConfigSvcCfg import getHLTConfigSvc
 svcMgr += conf2toConfigurable( getHLTConfigSvc(ConfigFlags) )
 
@@ -626,9 +620,13 @@ if opt.reverseViews or opt.filterViews:
 include("TriggerTest/disableChronoStatSvcPrintout.py")
 
 #-------------------------------------------------------------
-# Disable spurious warnings from HepMcParticleLink, ATR-21838
+# MessageSvc
 #-------------------------------------------------------------
+svcMgr.MessageSvc.Format = "% F%40W%C%4W%R%e%s%8W%R%T %0W%M"
+svcMgr.MessageSvc.enableSuppression = False
+
 if ConfigFlags.Input.isMC:
+    # Disable spurious warnings from HepMcParticleLink, ATR-21838
     svcMgr.MessageSvc.setError += ['HepMcParticleLink']
 
 #-------------------------------------------------------------