diff --git a/ALICE3/Core/GeometryContainer.cxx b/ALICE3/Core/GeometryContainer.cxx
index 622e3d01757..f58c9b80926 100644
--- a/ALICE3/Core/GeometryContainer.cxx
+++ b/ALICE3/Core/GeometryContainer.cxx
@@ -101,6 +101,14 @@ void GeometryContainer::init(o2::framework::InitContext& initContext)
   }
 }
 
+void GeometryContainer::addEntry(const std::string& filename)
+{
+  if (!mCcdb) {
+    LOG(fatal) << " --- ccdb is not set";
+  }
+  mEntries.emplace_back(filename, mCcdb);
+}
+
 std::map<std::string, std::string> GeometryEntry::getConfiguration(const std::string& layerName) const
 {
   auto it = mConfigurations.find(layerName);
diff --git a/ALICE3/Core/GeometryContainer.h b/ALICE3/Core/GeometryContainer.h
index 755fa57b87b..b3e9e23a538 100644
--- a/ALICE3/Core/GeometryContainer.h
+++ b/ALICE3/Core/GeometryContainer.h
@@ -91,7 +91,7 @@ class GeometryContainer
   void init(o2::framework::InitContext& initContext);
 
   // Add a geometry entry from a configuration file
-  void addEntry(const std::string& filename) { mEntries.emplace_back(filename, mCcdb); }
+  void addEntry(const std::string& filename);
   static void setLutCleanupSetting(const bool cleanLutWhenLoaded) { mCleanLutWhenLoaded = cleanLutWhenLoaded; }
   void setCcdbManager(o2::ccdb::BasicCCDBManager* mgr) { mCcdb = mgr; }
 
diff --git a/ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx b/ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx
index b2738c32c56..c11327e9f03 100644
--- a/ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx
+++ b/ALICE3/TableProducer/OTF/onTheFlyRichPid.cxx
@@ -288,6 +288,7 @@ struct OnTheFlyRichPid {
   float mMagneticField = 0.0f;
   void init(o2::framework::InitContext& initContext)
   {
+    mGeoContainer.setCcdbManager(ccdb.operator->());
     mGeoContainer.init(initContext);
 
     const int nGeometries = mGeoContainer.getNumberOfConfigurations();
diff --git a/ALICE3/TableProducer/OTF/onTheFlyTofPid.cxx b/ALICE3/TableProducer/OTF/onTheFlyTofPid.cxx
index aecf7a85134..75e9d41d5c2 100644
--- a/ALICE3/TableProducer/OTF/onTheFlyTofPid.cxx
+++ b/ALICE3/TableProducer/OTF/onTheFlyTofPid.cxx
@@ -147,6 +147,7 @@ struct OnTheFlyTofPid {
   float mMagneticField = 0.0f;
   void init(o2::framework::InitContext& initContext)
   {
+    mGeoContainer.setCcdbManager(ccdb.operator->());
     mGeoContainer.init(initContext);
 
     const int nGeometries = mGeoContainer.getNumberOfConfigurations();
diff --git a/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx b/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx
index 4eb0cf81ea4..814b55623fe 100644
--- a/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx
+++ b/ALICE3/TableProducer/OTF/onTheFlyTracker.cxx
@@ -317,6 +317,7 @@ struct OnTheFlyTracker {
     LOG(info) << "Initializing OnTheFlyTracker task";
     ccdb->setURL("http://alice-ccdb.cern.ch");
     ccdb->setTimestamp(-1);
+    mGeoContainer.setCcdbManager(ccdb.operator->());
     mGeoContainer.init(initContext);
 
     const int nGeometries = mGeoContainer.getNumberOfConfigurations();