diff --git a/external/InstallGeometry.cmake b/external/InstallGeometry.cmake
index 8df28d22dd53d3117a1bcbc2b758db55bb36a504..f80419d36335ab62a2ba22644c5bfe489e537959 100644
--- a/external/InstallGeometry.cmake
+++ b/external/InstallGeometry.cmake
@@ -1,4 +1,4 @@
-set(GEOMETRY_VERSION 163fb73b488d85e1cbd4d059806721ddd1ab6bc0)
+set(GEOMETRY_VERSION 3d14de4d5c891a22275bcb9f9d1e101214a90af9)
 set(GEOMETRY_SRC_URL "https://git.cbm.gsi.de/CbmSoft/cbmroot_geometry.git")
 
 download_project_if_needed(PROJECT         Geometry_source
diff --git a/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C b/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
index 64b45d91b0e2c8e4668aed38e99446f829fdf1d5..19e7268dd455a05c042a291cae569f4f9bb0eea1 100644
--- a/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
+++ b/macro/analysis/common/analysis_tree_converter/run_analysis_tree_maker.C
@@ -118,7 +118,9 @@ void run_analysis_tree_maker(TString dataSet = "../../../run/test", TString setu
   man->AddTask(new CbmRichRingsConverter("RichRings", "VtxTracks"));
   man->AddTask(new CbmTofHitsConverter("TofHits", "VtxTracks"));
   man->AddTask(new CbmTrdTracksConverter("TrdTracks", "VtxTracks"));
-  if (is_event_base) { man->AddTask(new CbmPsdModulesConverter("PsdModules")); }
+  if (is_event_base && setup->IsActive(ECbmModuleId::kPsd)) {
+    man->AddTask(new CbmPsdModulesConverter("PsdModules"));
+  }
   run->AddTask(man);
 
   // -----  Parameter database   --------------------------------------------