diff --git a/plugins/channelrx/freqscanner/freqscannergui.cpp b/plugins/channelrx/freqscanner/freqscannergui.cpp
index 02887781d..b0167df34 100644
--- a/plugins/channelrx/freqscanner/freqscannergui.cpp
+++ b/plugins/channelrx/freqscanner/freqscannergui.cpp
@@ -90,7 +90,11 @@ bool FreqScannerGUI::handleMessage(const Message& message)
     {
         qDebug("FreqScannerGUI::handleMessage: FreqScanner::MsgConfigureFreqScanner");
         const FreqScanner::MsgConfigureFreqScanner& cfg = (FreqScanner::MsgConfigureFreqScanner&) message;
-        m_settings = cfg.getSettings();
+        if (cfg.getForce()) {
+            m_settings = cfg.getSettings();
+        } else {
+            m_settings.applySettings(cfg.getSettingsKeys(), cfg.getSettings());
+        }
         blockApplySettings(true);
         m_channelMarker.updateSettings(static_cast<const ChannelMarker*>(m_settings.m_channelMarker));
         displaySettings();
diff --git a/plugins/channelrx/freqscanner/freqscannersink.cpp b/plugins/channelrx/freqscanner/freqscannersink.cpp
index a7069162d..c0bb5cd27 100644
--- a/plugins/channelrx/freqscanner/freqscannersink.cpp
+++ b/plugins/channelrx/freqscanner/freqscannersink.cpp
@@ -40,13 +40,17 @@ FreqScannerSink::FreqScannerSink() :
         m_binsPerChannel(16),
         m_averageCount(0)
 {
-   
     applySettings(m_settings, QStringList(), true);
     applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, 16, 4, true);
 }
 
 FreqScannerSink::~FreqScannerSink()
 {
+    if (m_fftSequence >= 0)
+    {
+        FFTFactory* fftFactory = DSPEngine::instance()->getFFTFactory();
+        fftFactory->releaseEngine(m_fftSize, false, m_fftSequence);
+    }
 }
 
 void FreqScannerSink::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end)