diff --git a/Event/ByteStreamCnvSvc/share/RDP_ByteStream_jobOptions.py b/Event/ByteStreamCnvSvc/share/RDP_ByteStream_jobOptions.py
index dc0cffe0722b88a20745719cd2ca3623e2c60f61..8d3ec14abeae7d164f589fbf273a134f891befb2 100644
--- a/Event/ByteStreamCnvSvc/share/RDP_ByteStream_jobOptions.py
+++ b/Event/ByteStreamCnvSvc/share/RDP_ByteStream_jobOptions.py
@@ -25,7 +25,8 @@ from AthenaServices.AthenaServicesConf import AthenaOutputStream
 topSequence += AthenaOutputStream(
     "StreamBS",
     EvtConversionSvc = "ByteStreamCnvSvc",
-    OutputFile = "ByteStreamRDP_OutputSvc"
+    OutputFile = "ByteStreamRDP_OutputSvc",
+    ExtraInputs = [( 'xAOD::EventInfo' , 'StoreGateSvc+EventInfo' ) ],
     )
 # ByteStreamCnvSvc is an input CnvSvc now. 
 EventPersistencySvc = svcMgr.EventPersistencySvc
diff --git a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx
index 3ccda05b67dfe9fa63af78ea5b0376e4cbb40eb2..b19f9a571fd91ecef76770dbed196e271f31d46e 100644
--- a/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx
+++ b/Event/ByteStreamCnvSvc/src/ByteStreamEventStorageOutputSvc.cxx
@@ -291,12 +291,12 @@ ByteStreamEventStorageOutputSvc::io_reinit() {
 
 const ByteStreamMetadata *
 ByteStreamEventStorageOutputSvc::getByteStreamMetadata(
-    const EventContext* ctx) {
-  const ByteStreamMetadataContainer* metaDataCont = ctx == nullptr
-      ? SG::get(m_byteStreamMetadataKey)
-      : SG::get(m_byteStreamMetadataKey, *ctx);
+    const EventContext* ctx)
+{
+  if (!ctx) ctx = &Gaudi::Hive::currentContext();
+  SG::ReadHandle<ByteStreamMetadataContainer> metaDataCont (m_byteStreamMetadataKey, *ctx);
 
-  if (metaDataCont == nullptr) return nullptr;
+  if (!metaDataCont.isValid()) return nullptr;
 
   if (metaDataCont->size() > 1)
     ATH_MSG_WARNING("Multiple run parameters in MetaDataStore. "