diff --git a/algo/detectors/tof/CalibratorChain.cxx b/algo/detectors/tof/CalibratorChain.cxx
index 4a9a35147af665d16d7464779c630ef8929ad1ec..6d1b30d4894fce6d5d1297981cb14f2b4be59058 100644
--- a/algo/detectors/tof/CalibratorChain.cxx
+++ b/algo/detectors/tof/CalibratorChain.cxx
@@ -19,6 +19,7 @@ CalibratorChain::ReturnType CalibratorChain::Run(gsl::span<CbmTofDigi> digis)
 {
   auto ret = (*fCalibrate)(digis);
 
-  L_(error) << "TOF Digis with unknown RPCs: " << std::get<1>(ret).fDigiCalibUnknownRPC;
+  auto nUnknownRPC = std::get<1>(ret).fDigiCalibUnknownRPC;
+  if (nUnknownRPC > 0) L_(error) << "TOF Digis with unknown RPCs: " << nUnknownRPC;
   return ret;
 }
diff --git a/algo/detectors/tof/Hitfind.h b/algo/detectors/tof/Hitfind.h
index 0b02d2d2019376dbb5c506cc9fcc6afaaee59331..0d0fe25418312066cdb6d65c9cd4ca9c3fbea1c6 100644
--- a/algo/detectors/tof/Hitfind.h
+++ b/algo/detectors/tof/Hitfind.h
@@ -32,7 +32,6 @@ namespace cbm::algo::tof
     xpu::timings fTime;
     size_t fNumDigis            = 0;
     size_t fNumHits             = 0;
-    size_t fDigiCalibUnknownRPC = 0;
 
     std::string print() const
     {
diff --git a/algo/detectors/tof/HitfinderChain.cxx b/algo/detectors/tof/HitfinderChain.cxx
index d23e9aea522ba3fb983b9e4c060cf476be95925f..9faaa9e6009b23b0c165a0fa12e5208e968f6547 100644
--- a/algo/detectors/tof/HitfinderChain.cxx
+++ b/algo/detectors/tof/HitfinderChain.cxx
@@ -21,6 +21,5 @@ HitfinderChain::ReturnType HitfinderChain::Run(gsl::span<CbmTofDigi> digis)
   auto ret = (*fHitfind)(digis);
 
   L_(info) << "TS contains " << std::get<0>(ret).NElements() << " TOF Hits";
-  L_(error) << "TOF Digis with unknown RPCs: " << std::get<1>(ret).fDigiCalibUnknownRPC;
   return ret;
 }
diff --git a/algo/global/Reco.cxx b/algo/global/Reco.cxx
index 83ebb30c9d07fbe8f88bc4cf3d6678d26be03d7b..2392645e35f1163d70774123e074876a29eeb6ef 100644
--- a/algo/global/Reco.cxx
+++ b/algo/global/Reco.cxx
@@ -45,6 +45,7 @@ void Reco::Init(const Options& opts)
   SetContext(&fContext);
   fUnpack.SetContext(&fContext);
   fStsHitFinder.SetContext(&fContext);
+  fTofCalibrator.SetContext(&fContext);
   fTofHitFinder.SetContext(&fContext);
   fTracking.SetContext(&fContext);
 
@@ -293,7 +294,6 @@ void Reco::QueueTofRecoMetrics(const tof::HitfindMonitorData& mon)
                              {"tofRecoThroughput", mon.fTime.throughput()},
                              {"tofRecoNumDigisIn", mon.fNumDigis},
                              {"tofRecoNumHits", mon.fNumHits},
-                             {"tofRecoUnknownRPC", mon.fDigiCalibUnknownRPC},
                            });
 }