diff --git a/Control/IOVSvc/src/CondInputLoader.cxx b/Control/IOVSvc/src/CondInputLoader.cxx
index 46ab639585db7519f3371e6d2b90bbb63c6e19f8..2a818d560a855800e1f2529c8ffe757e09f9fef7 100644
--- a/Control/IOVSvc/src/CondInputLoader.cxx
+++ b/Control/IOVSvc/src/CondInputLoader.cxx
@@ -244,15 +244,13 @@ CondInputLoader::execute()
   }
 
   // For a MC event, the run number we need to use to look up the conditions
-  // may be different from that of the event itself.  If we have
-  // a ConditionsRun attribute defined, use that to override
-  // the event number.
-  SG::ReadHandleKey<AthenaAttributeList> inputKey ("Input");
-  ATH_CHECK( inputKey.initialize() );
-  SG::ReadHandle<AthenaAttributeList> input (inputKey, getContext());
-  if (input.isValid()) {
-    if (input->exists ("ConditionsRun"))
-      now.set_run_number ((*input)["ConditionsRun"].data<unsigned int>());
+  // may be different from that of the event itself.  Override the run
+  // number with the conditions run number from the event context,
+  // if it is defined.
+  EventIDBase::number_type conditionsRun =
+    getContext().template getExtension<Atlas::ExtendedEventContext>()->conditionsRun();
+  if (conditionsRun != EventIDBase::UNDEFNUM) {
+    now.set_run_number (conditionsRun);
   }
 
   IOVTime t(now.run_number(), now.lumi_block(), now.time_stamp());
diff --git a/Control/IOVSvc/src/IOVSvcTool.cxx b/Control/IOVSvc/src/IOVSvcTool.cxx
index 865e0f1d5e093e73dcca9a70a8b6ade870ec9a35..7bc2b08938d5065237bef239856a1735c933680b 100644
--- a/Control/IOVSvc/src/IOVSvcTool.cxx
+++ b/Control/IOVSvc/src/IOVSvcTool.cxx
@@ -415,7 +415,9 @@ IOVSvcTool::handle(const Incident &inc) {
         m_log << MSG::DEBUG << "Unable to get the IOVDbSvc" << endmsg;
         return;
       }
-      if (StatusCode::SUCCESS != iovDB->signalBeginRun(m_curTime)) {
+      if (StatusCode::SUCCESS != iovDB->signalBeginRun(m_curTime,
+                                                       inc.context()))
+      {
         m_log << MSG::ERROR << "Unable to signal begin run to IOVDbSvc" << endmsg;
         return;
       }