diff --git a/macro/beamtime/mcbm2022/mcbm_unp_event.C b/macro/beamtime/mcbm2022/mcbm_unp_event.C
index 19581d98566989b7f646e62d3f7f31ee23b9c0a0..694b29c78f4eac134395fe2ef7220a1f953498c8 100644
--- a/macro/beamtime/mcbm2022/mcbm_unp_event.C
+++ b/macro/beamtime/mcbm2022/mcbm_unp_event.C
@@ -367,8 +367,8 @@ Bool_t mcbm_unp_event(std::string infile,
 
 
   // -----   CbmSetup   -----------------------------------------------------
-  /// Do automatic mapping only if not overridden by user
-  if (defaultSetupName == setupName) {
+  /// Do automatic mapping only if not overridden by user or empty
+  if (defaultSetupName == setupName || "" == setupName) {
     cbm::mcbm::ToForceLibLoad dummy;  /// Needed to trigger loading of the library as no fct dict in ROOT6 and CLING
     try {
       setupName = cbm::mcbm::GetSetupFromRunId(runid);
diff --git a/macro/run/run_unpack_online.C b/macro/run/run_unpack_online.C
index f3d9d0a1387ea111a5cc0669ece40b5aa4846b53..d11d8b5015514590e8977f57586045bb6ac24560 100644
--- a/macro/run/run_unpack_online.C
+++ b/macro/run/run_unpack_online.C
@@ -73,8 +73,8 @@ void run_unpack_online(std::vector<std::string> publisher = {"tcp://localhost:55
 
 
   // -----   CbmSetup   -----------------------------------------------------
-  /// Do automatic mapping only if not overridden by user
-  if (defaultSetupName == setupName) {
+  /// Do automatic mapping only if not overridden by user or empty
+  if (defaultSetupName == setupName || "" == setupName) {
     cbm::mcbm::ToForceLibLoad dummy;  /// Needed to trigger loading of the library as no fct dict in ROOT6 and CLING
     try {
       setupName = cbm::mcbm::GetSetupFromRunId(runid);
diff --git a/macro/run/run_unpack_online_bmon.C b/macro/run/run_unpack_online_bmon.C
index 80b4113402ead03ad255485adad29068f875b2c7..65aa2a8c2099efee4f3bb275d22994e13ea873e1 100644
--- a/macro/run/run_unpack_online_bmon.C
+++ b/macro/run/run_unpack_online_bmon.C
@@ -65,8 +65,8 @@ void run_unpack_online_bmon(std::vector<std::string> publisher = {"tcp://localho
 
 
   // -----   CbmSetup   -----------------------------------------------------
-  /// Do automatic mapping only if not overridden by user
-  if (defaultSetupName == setupName) {
+  /// Do automatic mapping only if not overridden by user or empty
+  if (defaultSetupName == setupName || "" == setupName) {
     cbm::mcbm::ToForceLibLoad dummy;  /// Needed to trigger loading of the library as no fct dict in ROOT6 and CLING
     try {
       setupName = cbm::mcbm::GetSetupFromRunId(runid);
diff --git a/macro/run/run_unpack_tsa.C b/macro/run/run_unpack_tsa.C
index 295c765cd8e83751b85b449d363e2879aa279666..8561750b8cb8b8100417f06eda310c74ceb197b5 100644
--- a/macro/run/run_unpack_tsa.C
+++ b/macro/run/run_unpack_tsa.C
@@ -91,8 +91,8 @@ void run_unpack_tsa(std::vector<std::string> infile = {"test.tsa"}, UInt_t runid
 
 
   // -----   CbmSetup   -----------------------------------------------------
-  /// Do automatic mapping only if not overridden by user
-  if (defaultSetupName == setupName) {
+  /// Do automatic mapping only if not overridden by user or empty
+  if (defaultSetupName == setupName || "" == setupName) {
     cbm::mcbm::ToForceLibLoad dummy;  /// Needed to trigger loading of the library as no fct dict in ROOT6 and CLING
     try {
       setupName = cbm::mcbm::GetSetupFromRunId(runid);
diff --git a/macro/run/run_unpack_tsa_bmon.C b/macro/run/run_unpack_tsa_bmon.C
index c9bf7137f87fd92bc37f676bb3c6557d57466d20..2479bdf3b66f5e72e80f9db7880ce728f164ec09 100644
--- a/macro/run/run_unpack_tsa_bmon.C
+++ b/macro/run/run_unpack_tsa_bmon.C
@@ -78,8 +78,8 @@ void run_unpack_tsa_bmon(std::vector<std::string> infile = {"test.tsa"}, UInt_t
 
 
   // -----   CbmSetup   -----------------------------------------------------
-  /// Do automatic mapping only if not overridden by user
-  if (defaultSetupName == setupName) {
+  /// Do automatic mapping only if not overridden by user or empty
+  if (defaultSetupName == setupName || "" == setupName) {
     cbm::mcbm::ToForceLibLoad dummy;  /// Needed to trigger loading of the library as no fct dict in ROOT6 and CLING
     try {
       setupName = cbm::mcbm::GetSetupFromRunId(runid);