diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
index bd799073cc868b667a1907f99a68ba13b3d12fc2..4e2bb65fb701bf60630faade098ef0e81ed4e103 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
@@ -13,9 +13,17 @@ from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 from AthenaServices.AthenaServicesConf import AthenaOutputStream
 from AthenaServices.AthenaServicesConf import AthenaOutputStreamTool
 
+_trigNavThinningSvcs = {}
+def registerTrigNavThinningSvc (streamName, svc):
+   _trigNavThinningSvcs[streamName] = svc
+   return
+
 def createOutputStream( streamName, fileName = "", asAlg = False, noTag = False,
                         eventInfoKey = "EventInfo", decisionFilter="",
                         trigNavThinningSvc = None ):
+   if trigNavThinningSvc is None:
+      trigNavThinningSvc = _trigNavThinningSvcs.get (streamName, None)
+
    # define athena output stream
    writingTool = AthenaOutputStreamTool( streamName + "Tool" )
    outputStream = AthenaOutputStream(