diff --git a/Framework/Core/src/LifetimeHelpers.cxx b/Framework/Core/src/LifetimeHelpers.cxx
index 4621738ec154e..21aa29c1f10e9 100644
--- a/Framework/Core/src/LifetimeHelpers.cxx
+++ b/Framework/Core/src/LifetimeHelpers.cxx
@@ -423,7 +423,7 @@ ExpirationHandler::Handler LifetimeHelpers::enumerate(ConcreteDataMatcher const&
     dh.payloadSerializationMethod = gSerializationMethodNone;
     dh.tfCounter = timestamp;
     try {
-      dh.runNumber = atoi(services.get<DataTakingContext>().runNumber.c_str());
+      dh.runNumber = strtoull(services.get<RawDeviceService>().device()->fConfig->GetProperty<std::string>("runNumber", "0").c_str(), nullptr, 10);
     } catch (...) {
       dh.runNumber = 0;
     }
diff --git a/Framework/Core/test/test_SimpleTimer.cxx b/Framework/Core/test/test_SimpleTimer.cxx
index df935eb6eb2a0..b2b5a4558f961 100644
--- a/Framework/Core/test/test_SimpleTimer.cxx
+++ b/Framework/Core/test/test_SimpleTimer.cxx
@@ -38,7 +38,10 @@ std::vector<DataProcessorSpec> defineDataProcessing(ConfigContext const&)
         InputSpec{"atimer", "TST", "TIMER", 0, Lifetime::Timer}},
       {},
       AlgorithmSpec{
-        adaptStateless([](ControlService& control) {
+        adaptStateless([](ControlService& control, InputRecord& inputs) {
+          DataRef ref = inputs.get("atimer");
+          auto* header = o2::header::get<o2::header::DataHeader*>(ref.header);
+          LOG(info) << "Run number: " << header->runNumber;
           // This is invoked autonomously by the timer.
           control.readyToQuit(QuitRequest::Me);
         })}},