diff --git a/core/detectors/tof/CbmTofGeoHandler.cxx b/core/detectors/tof/CbmTofGeoHandler.cxx
index 5c87b7e8a13f005f54b85f1f0e0d60e500fdc658..bdfdfac2904a6729e5ad6578ff82ef791925358f 100644
--- a/core/detectors/tof/CbmTofGeoHandler.cxx
+++ b/core/detectors/tof/CbmTofGeoHandler.cxx
@@ -108,8 +108,7 @@ Int_t CbmTofGeoHandler::CheckGeometryVersion() {
       else if ((TString(node->GetName()).Contains("v14")) || (TString(node->GetName()).Contains("v16a"))
                || (TString(node->GetName()).Contains("v16c")) || (TString(node->GetName()).Contains("v16d"))
                || (TString(node->GetName()).Contains("v16e")) || (TString(node->GetName()).Contains("v17a"))
-               || (TString(node->GetName()).Contains("v17c")) || (TString(node->GetName()).Contains("v19"))
-               || ((TString(node->GetName()).Contains("v20a")) && (!(TString(node->GetName()).Contains("mcbm"))))) {
+               || (TString(node->GetName()).Contains("v17c")) || (TString(node->GetName()).Contains("v19"))) {
         LOG(info)
           << "CbmTofGeoHandler::CheckGeometryVersion: Found TOF geometry "
           << TString(node->GetName()) << ", treat as Id 14a   ";
diff --git a/reco/detectors/tof/CbmTofSimpClusterizer.cxx b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
index 4fb32c4a5cbbf9d85dfcc968856d929add11abb5..d8687b04b2c7dcf99edf4e7723d94282cb49eb5a 100644
--- a/reco/detectors/tof/CbmTofSimpClusterizer.cxx
+++ b/reco/detectors/tof/CbmTofSimpClusterizer.cxx
@@ -11,6 +11,7 @@
 #include "CbmTofCreateDigiPar.h"
 #include "CbmTofDetectorId_v12b.h"  // in cbmdata/tof
 #include "CbmTofDetectorId_v14a.h"  // in cbmdata/tof
+#include "CbmTofDetectorId_v21a.h"  // in cbmdata/tof
 #include "CbmTofDigi.h"             // in cbmdata/tof
 #include "CbmTofDigiBdfPar.h"       // in tof/TofParam
 #include "CbmTofDigiPar.h"          // in tof/TofParam
@@ -432,6 +433,7 @@ Bool_t CbmTofSimpClusterizer::InitParameters() {
     switch (iGeoVersion) {
       case k12b: fTofId = new CbmTofDetectorId_v12b(); break;
       case k14a: fTofId = new CbmTofDetectorId_v14a(); break;
+      case k21a: fTofId = new CbmTofDetectorId_v21a(); break;
       default:
         LOG(error)
           << "CbmTofSimpClusterizer::InitParameters => Invalid geometry!!!"