diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/share/TGC_Digitization_2016deadChamber.dat b/MuonSpectrometer/MuonDigitization/TGC_Digitization/share/TGC_Digitization_2016deadChamber.dat
new file mode 100644
index 0000000000000000000000000000000000000000..2cad399a0e7c6b7227f0b7ad57c0bb2c86f697ab
--- /dev/null
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/share/TGC_Digitization_2016deadChamber.dat
@@ -0,0 +1,9 @@
+42  3  9 1 # A03 M1 f2  E1 L1  HV OFF (since Run-1)
+41  1  4 3 # A03 M1 f0  F  L3  broken chamber since Run-1
+44  4 27 1 # A08 M2 f0  E2 L1  HV OFF (since Run-1)
+46  5 34 2 # A09 M3 f3  E1 L2  HV OFF (since Run-1)
+42  3 46 2 # A12 M1 f3  E2 L2  HV OFF (since Run-1)
+43 -1  5 1 # C03 M2 f2  F  L1  HV OFF (since Run-1)
+45 -1  5 1 # C03 M3 f2  F  L1  HV OFF (since Run-1)
+42 -4 21 2 # C06 M1 f2  E2 L2  HV OFF (since Run-1)
+42 -2 40 1 # C11 M1 f1  E4 L1  HV OFF (since 2015)
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx
index 935f215f2c02139730de771df40b9e4f08a9010b..f36ebc4221e402d3b15c69c88ac4fa0d8adfdbc5 100644
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitMaker.cxx
@@ -808,7 +808,8 @@ void TgcDigitMaker::readFileOfDeadChamber() {
   // Find path to the TGC_Digitization_deadChamber.dat file
   std::string fileName;
   if(m_runperiod == 1) fileName = "TGC_Digitization_deadChamber.dat";
-  else if(m_runperiod == 2) fileName = "TGC_Digitization_NOdeadChamber.dat";
+  else if(m_runperiod == 2) fileName = "TGC_Digitization_2016deadChamber.dat";
+  else if(m_runperiod == 3) fileName = "TGC_Digitization_NOdeadChamber.dat";
   else {
     msg(MSG::ERROR) << "Run Period " << m_runperiod << " is unexpected in TgcDigitMaker - using NOdeadChamber configuration." << endreq;
     fileName = "TGC_Digitization_NOdeadChamber.dat";
diff --git a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitizationTool.cxx b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitizationTool.cxx
index 62476f5af32ab5fffcc7f9af914f62342c125a99..8268303574fe1e14f8f79558a2418e777198aab4 100644
--- a/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitizationTool.cxx
+++ b/MuonSpectrometer/MuonDigitization/TGC_Digitization/src/TgcDigitizationTool.cxx
@@ -115,8 +115,8 @@ StatusCode TgcDigitizationTool::initialize()
     std::string configVal = (*atlasCommonRec)[0]->getString("CONFIG");
     if(configVal=="RUN1") runperiod = 1;
     else if(configVal=="RUN2") runperiod = 2;
-    else if(configVal=="RUN3") runperiod = 2; // currently runperiod 2 means no masking => ok for upgrade
-    else if(configVal=="RUN4") runperiod = 2; // currently runperiod 2 means no masking => ok for upgrade
+    else if(configVal=="RUN3") runperiod = 3; // currently runperiod 3 means no masking => ok for upgrade
+    else if(configVal=="RUN4") runperiod = 3; // currently runperiod 3 means no masking => ok for upgrade
     else {
       ATH_MSG_FATAL("Unexpected value for geometry config read from the database: " << configVal);  
       return StatusCode::FAILURE;