diff --git a/plugins/channelrx/demodbfm/bfmdemod.cpp b/plugins/channelrx/demodbfm/bfmdemod.cpp
index 39b08354d..be39a5b80 100644
--- a/plugins/channelrx/demodbfm/bfmdemod.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemod.cpp
@@ -86,8 +86,6 @@ BFMDemod::BFMDemod(DeviceSourceAPI *deviceAPI) :
     m_threadedChannelizer = new ThreadedBasebandSampleSink(m_channelizer, this);
     m_deviceAPI->addThreadedSink(m_threadedChannelizer);
 
-    connect(m_channelizer, SIGNAL(inputSampleRateChanged()), this, SLOT(channelSampleRateChanged()));
-
     applySettings(m_settings, true);
 }
 
@@ -302,12 +300,6 @@ void BFMDemod::stop()
 {
 }
 
-void BFMDemod::channelSampleRateChanged()
-{
-    MsgReportChannelSampleRateChanged *msg = MsgReportChannelSampleRateChanged::create(getSampleRate());
-    getMessageQueueToGUI()->push(msg);
-}
-
 bool BFMDemod::handleMessage(const Message& cmd)
 {
 	if (DownChannelizer::MsgChannelizerNotification::match(cmd))
@@ -325,6 +317,12 @@ bool BFMDemod::handleMessage(const Message& cmd)
                 << " m_inputSampleRate: " << settings.m_inputSampleRate
                 << " m_inputFrequencyOffset: " << settings.m_inputFrequencyOffset;
 
+        if (getMessageQueueToGUI())
+        {
+            MsgReportChannelSampleRateChanged *msg = MsgReportChannelSampleRateChanged::create(getSampleRate());
+            getMessageQueueToGUI()->push(msg);
+        }
+
 		return true;
 	}
     else if (MsgConfigureChannelizer::match(cmd))
diff --git a/plugins/channelrx/demodbfm/bfmdemod.h b/plugins/channelrx/demodbfm/bfmdemod.h
index 1d5ddf13e..43c5a6c9b 100644
--- a/plugins/channelrx/demodbfm/bfmdemod.h
+++ b/plugins/channelrx/demodbfm/bfmdemod.h
@@ -146,9 +146,6 @@ public:
 
     static const QString m_channelID;
 
-private slots:
-    void channelSampleRateChanged();
-
 private:
 	enum RateState {
 		RSInitialFill,
diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
index dd2201b75..e57bb57aa 100644
--- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
@@ -112,6 +112,7 @@ bool BFMDemodGUI::handleMessage(const Message& message)
     {
         BFMDemod::MsgReportChannelSampleRateChanged& report = (BFMDemod::MsgReportChannelSampleRateChanged&) message;
         m_rate = report.getSampleRate();
+        qDebug("BFMDemodGUI::handleMessage: MsgReportChannelSampleRateChanged: %d S/s", m_rate);
         ui->glSpectrum->setCenterFrequency(m_rate / 4);
         ui->glSpectrum->setSampleRate(m_rate / 2);
         return true;
@@ -128,8 +129,6 @@ void BFMDemodGUI::handleInputMessages()
 
     while ((message = getInputMessageQueue()->pop()) != 0)
     {
-        qDebug("BFMDemodGUI::handleInputMessages: message: %s", message->getIdentifier());
-
         if (handleMessage(*message))
         {
             delete message;