diff --git a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
index b652dd5b3104963ecc6996b065562993c4f2b78d..88fac7091b3905d8020bd12b0bf7c204159c5e82 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/InDetJobProperties.py
@@ -1013,6 +1013,12 @@ class useBroadSCTClusterErrors(InDetFlagsJobProperty):
     allowedTypes = ['NoneType','bool']
     StoredValue  = None
 
+class useMuForTRTErrorScaling(InDetFlagsJobProperty):
+    """ Use mu from lumi conditions data for TRT error scaling"""
+    statusOn     = True
+    allowedTypes = ['NoneType','bool']
+    StoredValue  = False
+
 class writeRDOs(InDetFlagsJobProperty):
     """ Write RDOs into ESD """
     statusOn     = True
@@ -2809,7 +2815,8 @@ _list_InDetJobProperties = [Enabled,
                             doStoreTrackSeeds,
                             doHIP300,
                             checkDeadElementsOnTrack,
-                            doDigitalROTCreation
+                            doDigitalROTCreation,
+                            useMuForTRTErrorScaling
                            ]
 for j in _list_InDetJobProperties: 
     jobproperties.InDetJobProperties.add_JobProperty(j)
diff --git a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
index d6a081a1f7676506d88651c2092d7ba92068b677..0e04df4fa9341dbf4c89f5733768c85d50ab4c70 100644
--- a/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
+++ b/InnerDetector/InDetExample/InDetRecExample/python/TrackingCommon.py
@@ -431,7 +431,9 @@ def getLumiCondDataKeyForTRTMuScaling(**kwargs) :
     from InDetRecExample.InDetJobProperties import InDetFlags
     isHLT=kwargs.pop('isHLT',False)
     kwargs.pop('namePrefix','')
-    if not InDetFlags.doCosmics() :
+    if not InDetFlags.doCosmics() and InDetFlags.useMuForTRTErrorScaling():
+        # @TODO remove flag useMuForTRTErrorScaling once TRT mu dependent ERROR scaling not needed any more or
+        #       LuminosityCondAlgDefault always uses the correct database and   folder
         from LumiBlockComps.LuminosityCondAlgDefault import LuminosityCondAlgDefault,LuminosityCondAlgOnlineDefault
         from AthenaCommon.AthenaCommonFlags  import athenaCommonFlags
         lumiAlg = LuminosityCondAlgDefault() if not athenaCommonFlags.isOnline() and not isHLT else LuminosityCondAlgOnlineDefault()