diff --git a/reco/tasks/CbmTaskDigiEventQa.cxx b/reco/tasks/CbmTaskDigiEventQa.cxx
index 4b0e370a51700318824367aa5ffea9c12f1aa379..1ea9b16047eb207ae990c05aefb1751bc5994f7a 100644
--- a/reco/tasks/CbmTaskDigiEventQa.cxx
+++ b/reco/tasks/CbmTaskDigiEventQa.cxx
@@ -161,12 +161,16 @@ InitStatus CbmTaskDigiEventQa::Init()
 // -----   Convert CBM histogram to ROOT histogram   --------------------------
 TH1D* CbmTaskDigiEventQa::ToTH1D(const cbm::algo::Histo1D& source)
 {
-
+  bool add = TH1::AddDirectoryStatus();
+  TH1::AddDirectory(false);  // Needed to prevent ROOT from adding histogram to its internal registry
   TH1D* result =
     new TH1D(source.Name().c_str(), source.Name().c_str(), source.NumBins(), source.MinValue(), source.MaxValue());
+  TH1::AddDirectory(add);  // Needed to prevent ROOT from adding histogram to its internal registry
   for (uint32_t bin = 0; bin < source.NumBins(); bin++) {
-    result->SetBinContent(bin, source.Content(bin));
+    result->SetBinContent(1 + bin, source.Content(bin));
   }
+  result->SetBinContent(0, source.Underflow());
+  result->SetBinContent(source.NumBins(), source.Overflow());
   result->SetEntries(source.NumEntries());
   return result;
 }