diff --git a/plugins/channelrx/demodbfm/bfmdemodgui.cpp b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
index f6237068e..e19f11614 100644
--- a/plugins/channelrx/demodbfm/bfmdemodgui.cpp
+++ b/plugins/channelrx/demodbfm/bfmdemodgui.cpp
@@ -397,15 +397,15 @@ BFMDemodGUI::BFMDemodGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseban
 	ui->glSpectrum->setDisplayMaxHold(false);
 	ui->glSpectrum->setSsbSpectrum(true);
 	m_spectrumVis->configure(
-	        m_spectrumVis->getInputMessageQueue(),
-            64, // FFT size
-            0, // Ref level (dB)
-            100, // Power range (dB)
-            10, // overlapping %
-            0,  // number of averaging samples
-            SpectrumVis::AvgModeNone,  // no averaging
-	        FFTWindow::BlackmanHarris,
-	        false); // logarithmic scale
+        64, // FFT size
+        0, // Ref level (dB)
+        100, // Power range (dB)
+        10, // overlapping %
+        0,  // number of averaging samples
+        SpectrumVis::AvgModeNone,  // no averaging
+        FFTWindow::BlackmanHarris,
+        false // logarithmic scale
+    );
 	connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
 
 	m_channelMarker.blockSignals(true);
diff --git a/plugins/channelrx/udpsink/udpsinkgui.cpp b/plugins/channelrx/udpsink/udpsinkgui.cpp
index 4be4c04d9..c583bc632 100644
--- a/plugins/channelrx/udpsink/udpsinkgui.cpp
+++ b/plugins/channelrx/udpsink/udpsinkgui.cpp
@@ -187,15 +187,16 @@ UDPSinkGUI::UDPSinkGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, BasebandS
 	ui->glSpectrum->setSampleRate(ui->sampleRate->text().toInt());
 	ui->glSpectrum->setDisplayWaterfall(true);
 	ui->glSpectrum->setDisplayMaxHold(true);
-	m_spectrumVis->configure(m_spectrumVis->getInputMessageQueue(),
-	        64, // FFT size
-            0, // Ref level (dB)
-            100, // Power range (dB)
-	        10, // overlapping %
-	        0,  // number of averaging samples
-	        SpectrumVis::AvgModeNone,  // no averaging
-	        FFTWindow::BlackmanHarris,
-	        false); // logarithmic scale
+	m_spectrumVis->configure(
+        64, // FFT size
+        0, // Ref level (dB)
+        100, // Power range (dB)
+        10, // overlapping %
+        0,  // number of averaging samples
+        SpectrumVis::AvgModeNone,  // no averaging
+        FFTWindow::BlackmanHarris,
+        false // logarithmic scale
+    );
 
 	ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer());
 	connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
diff --git a/plugins/channeltx/udpsource/udpsourcegui.cpp b/plugins/channeltx/udpsource/udpsourcegui.cpp
index 41394cd5f..8d328935c 100644
--- a/plugins/channeltx/udpsource/udpsourcegui.cpp
+++ b/plugins/channeltx/udpsource/udpsourcegui.cpp
@@ -144,15 +144,16 @@ UDPSourceGUI::UDPSourceGUI(PluginAPI* pluginAPI, DeviceUISet *deviceUISet, Baseb
     ui->glSpectrum->setSampleRate(ui->sampleRate->text().toInt());
     ui->glSpectrum->setDisplayWaterfall(true);
     ui->glSpectrum->setDisplayMaxHold(true);
-    m_spectrumVis->configure(m_spectrumVis->getInputMessageQueue(),
-            64, // FFT size
-            0, // Ref level (dB)
-            100, // Power range (dB)
-            10, // overlapping %
-            0,  // number of averaging samples
-            SpectrumVis::AvgModeNone,  // no averaging
-            FFTWindow::BlackmanHarris,
-            false); // logarithmic scale
+    m_spectrumVis->configure(
+        64, // FFT size
+        0, // Ref level (dB)
+        100, // Power range (dB)
+        10, // overlapping %
+        0,  // number of averaging samples
+        SpectrumVis::AvgModeNone,  // no averaging
+        FFTWindow::BlackmanHarris,
+        false // logarithmic scale
+    );
 
     ui->glSpectrum->connectTimer(MainWindow::getInstance()->getMasterTimer());
     connect(&MainWindow::getInstance()->getMasterTimer(), SIGNAL(timeout()), this, SLOT(tick()));
diff --git a/sdrbase/dsp/spectrumvis.cpp b/sdrbase/dsp/spectrumvis.cpp
index c3d54a6f9..ef5dc59cd 100644
--- a/sdrbase/dsp/spectrumvis.cpp
+++ b/sdrbase/dsp/spectrumvis.cpp
@@ -81,15 +81,15 @@ void SpectrumVis::closeWSSpectrum()
     getInputMessageQueue()->push(cmd);
 }
 
-void SpectrumVis::configure(MessageQueue* msgQueue,
-        int fftSize,
-        float refLevel,
-        float powerRange,
-        int overlapPercent,
-        unsigned int averagingNb,
-        AvgMode averagingMode,
-        FFTWindow::Function window,
-        bool linear)
+void SpectrumVis::configure(
+    int fftSize,
+    float refLevel,
+    float powerRange,
+    int overlapPercent,
+    unsigned int averagingNb,
+    AvgMode averagingMode,
+    FFTWindow::Function window,
+    bool linear)
 {
     GLSpectrumSettings settings = m_settings;
     settings.m_fftSize = fftSize;
@@ -103,7 +103,7 @@ void SpectrumVis::configure(MessageQueue* msgQueue,
 
     MsgConfigureSpectrumVis* cmd = MsgConfigureSpectrumVis::create(settings, false);
 
-	msgQueue->push(cmd);
+	getInputMessageQueue()->push(cmd);
 }
 
 void SpectrumVis::setScalef(Real scalef)
diff --git a/sdrbase/dsp/spectrumvis.h b/sdrbase/dsp/spectrumvis.h
index a6247967e..2bf95da08 100644
--- a/sdrbase/dsp/spectrumvis.h
+++ b/sdrbase/dsp/spectrumvis.h
@@ -78,15 +78,16 @@ public:
     void openWSSpectrum();
     void closeWSSpectrum();
 
-	void configure(MessageQueue* msgQueue,
-	        int fftSize,
-            float refLevel,
-            float powerRange,
-	        int overlapPercent,
-	        unsigned int averagingNb,
-	        AvgMode averagingMode,
-	        FFTWindow::Function window,
-	        bool m_linear);
+	void configure(
+        int fftSize,
+        float refLevel,
+        float powerRange,
+        int overlapPercent,
+        unsigned int averagingNb,
+        AvgMode averagingMode,
+        FFTWindow::Function window,
+        bool m_linear
+    );
     void setScalef(Real scalef);
     void configureWSSpectrum(const QString& address, uint16_t port);
 
diff --git a/sdrgui/gui/glspectrumgui.cpp b/sdrgui/gui/glspectrumgui.cpp
index 8ffbbb26f..1171dbcdb 100644
--- a/sdrgui/gui/glspectrumgui.cpp
+++ b/sdrgui/gui/glspectrumgui.cpp
@@ -229,15 +229,15 @@ void GLSpectrumGUI::applySettingsVis()
 
 	if (m_spectrumVis)
 	{
-	    m_spectrumVis->configure(m_messageQueueToVis,
-	            m_fftSize,
-                m_refLevel,
-                m_powerRange,
-	            m_fftOverlap,
-	            m_averagingNb,
-	            (SpectrumVis::AvgMode) m_averagingMode,
-	            (FFTWindow::Function) m_fftWindow,
-	            m_linear
+	    m_spectrumVis->configure(
+            m_fftSize,
+            m_refLevel,
+            m_powerRange,
+            m_fftOverlap,
+            m_averagingNb,
+            (SpectrumVis::AvgMode) m_averagingMode,
+            (FFTWindow::Function) m_fftWindow,
+            m_linear
 		);
 	}