diff --git a/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py b/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py
index 0b68f913321e58fb59069f212b566be83072e058..a7a08d463075f3e49aa12292ef8efd4bb00553d4 100644
--- a/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py
+++ b/Trigger/TrigMonitoring/TrigCostMonitor/python/TrigCostMonitorConfig.py
@@ -575,7 +575,7 @@ def postSetupOnlineCost():
                 if tool.getType().count('TrigCostTool'):
                     tool.doOperationalInfo = steeringEF_online_doOperationalInfo
                     log.info('Set '+tool.name()+'.doOperationalInfo='+str(topSeq.TrigSteer_EF.doOperationalInfo))
-        
+
     if hasattr(topSeq, 'TrigSteer_HLT'):        
         topSeq.TrigSteer_HLT.doOperationalInfo=steeringHLT_online_doOperationalInfo
         log.info('Set TrigSteer_HLT.doOperationalInfo='+str(topSeq.TrigSteer_HLT.doOperationalInfo))
@@ -585,13 +585,20 @@ def postSetupOnlineCost():
                 if tool.getType().count('TrigCostTool'):
                     tool.doOperationalInfo = steeringHLT_online_doOperationalInfo
                     log.info('Set '+tool.name()+'.doOperationalInfo='+str(topSeq.TrigSteer_HLT.doOperationalInfo))
-        
+
         if 'doDetailedROBMonitoring' in svcMgr.ROBDataProviderSvc.properties():
             svcMgr.ROBDataProviderSvc.doDetailedROBMonitoring = True
             log.info('Set ROBDataProviderSvc.doDetailedROBMonitoring=True')
         else:
             log.info('ROBDataProviderSvc does not have property doDetailedROBMonitoring - will not do cost monitor for ROS.')
 
+    if 'doCostMonitoring' in svcMgr.ROBDataProviderSvc.properties():
+        from AthenaConfiguration.AllConfigFlags import ConfigFlags
+        svcMgr.ROBDataProviderSvc.doCostMonitoring = (ConfigFlags.Trigger.CostMonitoring.doCostMonitoring and ConfigFlags.Trigger.CostMonitoring.monitorROBs)
+        log.info('Set ROBDataProviderSvc.doCostMonitoring=True')
+    else:
+        log.info('ROBDataProviderSvc does not have property doCostMonitoring - will not do cost monitor for ROS.')
+
 #----------------------------------------------------------------------
 # Set options for running cost on CAF - used together with CostExecL2/EF options!!!
 #
diff --git a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
index 50490bf04b8dfd15633525f187999afe246e1c5d..822ec9e8429e13e06852ee8c470a6572f9f14d91 100644
--- a/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
+++ b/Trigger/TriggerCommon/TriggerJobOpts/python/TriggerConfigFlags.py
@@ -143,6 +143,7 @@ def createTriggerFlags():
     flags.addFlag('Trigger.CostMonitoring.chain', 'HLT_costmonitor_CostMonDS_L1All')
     flags.addFlag('Trigger.CostMonitoring.outputCollection', 'HLT_TrigCostContainer')
     flags.addFlag('Trigger.CostMonitoring.monitorAllEvents', False)
+    flags.addFlag('Trigger.CostMonitoring.monitorROBs', False)
 
 
     # enable Bcm inputs simulation