diff --git a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
index 050217a..d4f2874 100644
--- a/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
+++ b/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp
@@ -87,6 +87,18 @@ void GLWaveformRendererFilteredSignal::draw(QPainter* painter, QPaintEvent* /*ev
     float maxMid[2];
     float maxHigh[2];
 
+    if (m_lowKillControlObject && m_lowKillControlObject->get() == 1.0) {
+        lowGain = 0;
+    }
+
+    if (m_midKillControlObject && m_midKillControlObject->get() == 1.0) {
+        midGain = 0;
+    }
+
+    if (m_highKillControlObject && m_highKillControlObject->get() == 1.0) {
+        highGain = 0;
+    }    
+
     float meanIndex;
 
     if (m_alignment == Qt::AlignCenter) {
diff --git a/src/waveform/renderers/waveformrendererfilteredsignal.cpp b/src/waveform/renderers/waveformrendererfilteredsignal.cpp
index e0a945e..db6a263 100644
--- a/src/waveform/renderers/waveformrendererfilteredsignal.cpp
+++ b/src/waveform/renderers/waveformrendererfilteredsignal.cpp
@@ -226,11 +226,17 @@ void WaveformRendererFilteredSignal::draw(QPainter* painter,
     }
 
     painter->setPen(QPen(QBrush(m_pColors->getLowColor()), 1));
-    painter->drawLines(&m_lowLines[0], actualLowLineNumber);
+    if (m_lowKillControlObject && m_lowKillControlObject->get() == 0.0) {
+       painter->drawLines(&m_lowLines[0], actualLowLineNumber);
+    }
     painter->setPen(QPen(QBrush(m_pColors->getMidColor()), 1));
-    painter->drawLines(&m_midLines[0], actualMidLineNumber);
+    if (m_midKillControlObject && m_midKillControlObject->get() == 0.0) {
+        painter->drawLines(&m_midLines[0], actualMidLineNumber);
+    }
     painter->setPen(QPen(QBrush(m_pColors->getHighColor()), 1));
-    painter->drawLines(&m_highLines[0], actualHighLineNumber);
+    if (m_highKillControlObject && m_highKillControlObject->get() == 0.0) {
+        painter->drawLines(&m_highLines[0], actualHighLineNumber);
+    }
 
     painter->restore();
 }