diff --git a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCondDbAlg.cxx b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCondDbAlg.cxx
index 4b8b1defcde4e1533476a00986c99ad036107110..27fc3e5b124271eed966ff7cf3de0c51f2273f4d 100644
--- a/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCondDbAlg.cxx
+++ b/MuonSpectrometer/MuonConditions/MuonCondGeneral/MuonCondAlg/src/MdtCondDbAlg.cxx
@@ -29,13 +29,13 @@ MdtCondDbAlg::initialize(){
     ATH_CHECK(m_condSvc .retrieve());
     ATH_CHECK(m_idHelperSvc.retrieve());
     ATH_CHECK(m_writeKey.initialize());
-    ATH_CHECK(m_readKey_folder_da_pshv.initialize(!m_readKey_folder_da_pshv.empty() && m_isData));
-    ATH_CHECK(m_readKey_folder_da_psv0.initialize(!m_readKey_folder_da_psv0.empty() && m_isData));
-    ATH_CHECK(m_readKey_folder_da_psv1.initialize(!m_readKey_folder_da_psv1.empty() && m_isData));
-    ATH_CHECK(m_readKey_folder_da_pslv.initialize(!m_readKey_folder_da_pslv.empty() && m_isData));
-    ATH_CHECK(m_readKey_folder_da_hv  .initialize(!m_readKey_folder_da_hv.empty() && m_isData));
-    ATH_CHECK(m_readKey_folder_da_lv  .initialize(!m_readKey_folder_da_lv.empty() && m_isData));
-    ATH_CHECK(m_readKey_folder_da_droppedChambers.initialize(!m_readKey_folder_da_droppedChambers.empty() && m_isData));
+    ATH_CHECK(m_readKey_folder_da_pshv.initialize(!m_readKey_folder_da_pshv.empty() && m_isData && m_isRun1));
+    ATH_CHECK(m_readKey_folder_da_psv0.initialize(!m_readKey_folder_da_psv0.empty() && m_isData && m_isRun1 && m_checkOnSetPoint));
+    ATH_CHECK(m_readKey_folder_da_psv1.initialize(!m_readKey_folder_da_psv1.empty() && m_isData && m_isRun1 && m_checkOnSetPoint));
+    ATH_CHECK(m_readKey_folder_da_pslv.initialize(!m_readKey_folder_da_pslv.empty() && m_isData && m_isRun1));
+    ATH_CHECK(m_readKey_folder_da_hv  .initialize(!m_readKey_folder_da_hv.empty() && m_isData && !m_isRun1));
+    ATH_CHECK(m_readKey_folder_da_lv  .initialize(!m_readKey_folder_da_lv.empty() && m_isData && !m_isRun1));
+    ATH_CHECK(m_readKey_folder_da_droppedChambers.initialize(!m_readKey_folder_da_droppedChambers.empty() && m_isData && m_isRun1));
     ATH_CHECK(m_readKey_folder_mc_droppedChambers.initialize(!m_readKey_folder_mc_droppedChambers.empty() && !m_isData));
     ATH_CHECK(m_readKey_folder_mc_noisyChannels  .initialize(!m_readKey_folder_mc_noisyChannels.empty() && !m_isData));
     // The calls to the functions that use these two are commented out,