diff --git a/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx b/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx
index 932e66263d9aeb83c5f099a710f77ae225e19913..3e10288eaa2e68f82f1c72be38fde04cb73c66fd 100644
--- a/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx
+++ b/Calorimeter/CaloDigiAlgs/src/CaloWaveformDigiAlg.cxx
@@ -114,7 +114,8 @@ CaloWaveformDigiAlg::execute(const EventContext& ctx) const {
     // Waveform was empty, fill with baseline
     int channel = m_mappingTool->getChannelMapping(w.first);
     ATH_MSG_DEBUG("Writing baseline into empty waveform in channel "<< channel);
-    for (const auto& tk : m_timekernel) {
+    int i = m_digiTool->nsamples();
+    while(i--) {  // Use while to avoid unused variable warning with for
       int baseline = m_digiTool->generate_baseline(m_base_mean, m_base_rms);
       waveforms[w.first].push_back(baseline);
     }
diff --git a/Scintillator/ScintDigiAlgs/src/ScintWaveformDigiAlg.cxx b/Scintillator/ScintDigiAlgs/src/ScintWaveformDigiAlg.cxx
index 1a528ca5d128736607a3e0061d19a680846e6b02..7eb12286567c42591314592ece065136a754d43d 100644
--- a/Scintillator/ScintDigiAlgs/src/ScintWaveformDigiAlg.cxx
+++ b/Scintillator/ScintDigiAlgs/src/ScintWaveformDigiAlg.cxx
@@ -147,7 +147,8 @@ ScintWaveformDigiAlg::execute(const EventContext& ctx) const {
     // Waveform was empty, fill with baseline
     int channel = m_mappingTool->getChannelMapping(w.first);
     ATH_MSG_DEBUG("Writing baseline into empty waveform in channel "<< channel);
-    for (const auto& tk : m_timekernel) {
+    int i = m_digiTool->nsamples();
+    while(i--) {  // Use while to avoid unused variable warning with for
       int baseline = m_digiTool->generate_baseline(m_base_mean, m_base_rms);
       waveforms[w.first].push_back(baseline);
     }