diff --git a/setup/setup_sis100_electron.C b/setup/setup_sis100_electron.C
index 4fb5411e39ef17ad60d2b7da7716b92f9a96eed4..bdc24b952f47f683ad80014d11bfa5643bea9a77 100644
--- a/setup/setup_sis100_electron.C
+++ b/setup/setup_sis100_electron.C
@@ -28,10 +28,10 @@ void setup_sis100_electron()
   TString richGeoTag      = "v22a";
   TString trdGeoTag       = "v20b_1e";
   TString tofGeoTag       = "v21a_1e";
-  // TString psdGeoTag       = "v22a";  Paused or Removed Detector System
+  TString psdGeoTag       = "v22a";  // Paused or Removed Detector System, placeholder for Forward Wall Detector
   TString platGeoTag      = "v22b";
   // ------------------------------------------------------------------------
-  
+
   // -----  Magnetic field  -------------------------------------------------
   TString fieldTag      = "v22c";
   Double_t fieldZ       =  0.;            // field centre z position
@@ -53,7 +53,7 @@ void setup_sis100_electron()
   setup->SetModule(ECbmModuleId::kRich, richGeoTag);
   setup->SetModule(ECbmModuleId::kTrd, trdGeoTag);
   setup->SetModule(ECbmModuleId::kTof, tofGeoTag);
-  // setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
+  setup->SetModule(ECbmModuleId::kPsd, psdGeoTag);
   setup->SetModule(ECbmModuleId::kPlatform, platGeoTag);
   setup->SetField(fieldTag, fieldScale, 0., 0., fieldZ);
   // ------------------------------------------------------------------------
diff --git a/setup/setup_sis100_hadron.C b/setup/setup_sis100_hadron.C
index 565119fc4c828f1940b0a29dc966f04b95dfb7df..e543f48350cf42825e7d273c95f632be2d4bc915 100644
--- a/setup/setup_sis100_hadron.C
+++ b/setup/setup_sis100_hadron.C
@@ -26,7 +26,7 @@ void setup_sis100_hadron()
   TString stsGeoTag       = "v22c";
   TString trdGeoTag       = "v20c_1h";
   TString tofGeoTag       = "v21a_1h";
-  TString psdGeoTag       = "v22c"; // Paused or Removed Detector System
+  TString psdGeoTag       = "v22c"; // Paused or Removed Detector System, placeholder for Forward Wall Detector
   TString platGeoTag      = "v22b";
   // ------------------------------------------------------------------------