diff --git a/macro/alignment/run_BbaAlignment_mcbm.C b/macro/alignment/run_BbaAlignment_mcbm.C
index 60f8a7cb6b489f6d178b666aa394824c5cb970d3..cfd6c01bccfadbebb0b1fa5e900939572126dded 100644
--- a/macro/alignment/run_BbaAlignment_mcbm.C
+++ b/macro/alignment/run_BbaAlignment_mcbm.C
@@ -204,9 +204,6 @@ void run_BbaAlignment_mcbm(Int_t nEvents = 0, TString dataset = "data/mcbm_beam_
   // L1 CA track finder setup
   auto l1 = new CbmL1("CA");
   l1->SetMcbmMode();
-  l1->DisableTrackingStation(cbm::algo::ca::EDetectorID::kMuch, 0);
-  l1->DisableTrackingStation(cbm::algo::ca::EDetectorID::kMuch, 1);
-  l1->DisableTrackingStation(cbm::algo::ca::EDetectorID::kMuch, 2);
 
   // User configuration example for CA:
   //l1->SetConfigUser(srcDir + "/macro/L1/configs/ca_params_user_example.yaml");
diff --git a/macro/mcbm/mcbm_reco_event.C b/macro/mcbm/mcbm_reco_event.C
index e2000fcfffe4dc4e164970942986c6e6a0fe5a6b..015689c452bfd68f210a477941f043521c484e57 100644
--- a/macro/mcbm/mcbm_reco_event.C
+++ b/macro/mcbm/mcbm_reco_event.C
@@ -383,9 +383,6 @@ void mcbm_reco_event(Int_t nEvents = 10, TString dataset = "data/test",
   // L1 tracking
   auto l1 = (debugWithMC) ? new CbmL1("CA", 5, 1) : new CbmL1("CA");
   l1->SetMcbmMode();
-  l1->DisableTrackingStation(cbm::algo::ca::EDetectorID::kMuch, 0);
-  l1->DisableTrackingStation(cbm::algo::ca::EDetectorID::kMuch, 1);
-  l1->DisableTrackingStation(cbm::algo::ca::EDetectorID::kMuch, 2);
 
   // User configuration example for CA:
   //l1->SetConfigUser(srcDir + "/macro/L1/configs/ca_params_user_example.yaml");
diff --git a/reco/L1/CbmL1.cxx b/reco/L1/CbmL1.cxx
index c8335366388b4d7feddb711b1eaf38adc1082ba1..3bc1d19f00b845fc57868386196879702d7be688 100644
--- a/reco/L1/CbmL1.cxx
+++ b/reco/L1/CbmL1.cxx
@@ -215,6 +215,11 @@ InitStatus CbmL1::Init()
     fUseMUCH = 1;
     fUseTRD  = 1;
     fUseTOF  = 1;
+    TString tag;
+    CbmSetup::Instance()->GetGeoTag(ECbmModuleId::kMuch, tag);
+    if (tag.Contains("mcbm")) {  // currently disable tracking in much for all mcbm setups
+      fUseMUCH = 0;
+    }
     // fInitManager.DevSetIgnoreHitSearchAreas(true);  // uncomment for debug
   }