diff --git a/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py b/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
index 4e2bb65fb701bf60630faade098ef0e81ed4e103..0434b3db2290afc700c94db4f04791bd1a2c7116 100644
--- a/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
+++ b/Database/AthenaPOOL/OutputStreamAthenaPool/python/CreateOutputStreams.py
@@ -48,9 +48,12 @@ def createOutputStream( streamName, fileName = "", asAlg = False, noTag = False,
          # Tell tool to pick it up
          outputStream.WritingTool.AttributeListKey=key
          # build eventinfo attribute list
-         from .OutputStreamAthenaPoolConf import EventInfoAttListTool, EventInfoTagBuilder
-         svcMgr.ToolSvc += EventInfoAttListTool()
+         from .OutputStreamAthenaPoolConf import EventInfoAttListTool, EventInfoTagBuilder         
          EventInfoTagBuilder   = EventInfoTagBuilder(AttributeList=key, EventInfoKey=eventInfoKey, FilterString=decisionFilter)
+         from AthenaCommon.GlobalFlags  import globalflags
+         if globalflags.InputFormat() == 'bytestream':
+            #No event-tag input in bytestream
+            EventInfoTagBuilder.PropagateInput=False
          topSequence += EventInfoTagBuilder
 
    # decide where to put outputstream in sequencing