diff --git a/plugins/channeltx/udpsink/udpsink.cpp b/plugins/channeltx/udpsink/udpsink.cpp
index de1b6de3d..a4ad999bf 100644
--- a/plugins/channeltx/udpsink/udpsink.cpp
+++ b/plugins/channeltx/udpsink/udpsink.cpp
@@ -26,10 +26,8 @@ MESSAGE_CLASS_DEFINITION(UDPSink::MsgConfigureChannelizer, Message)
 MESSAGE_CLASS_DEFINITION(UDPSink::MsgUDPSinkSpectrum, Message)
 MESSAGE_CLASS_DEFINITION(UDPSink::MsgResetReadIndex, Message)
 
-UDPSink::UDPSink(MessageQueue* uiMessageQueue, UDPSinkGUI* udpSinkGUI, BasebandSampleSink* spectrum) :
+UDPSink::UDPSink(BasebandSampleSink* spectrum) :
     m_squelch(1e-6),
-    m_uiMessageQueue(uiMessageQueue),
-    m_udpSinkGUI(udpSinkGUI),
     m_spectrum(spectrum),
     m_spectrumEnabled(false),
     m_spectrumChunkSize(2160),
@@ -441,16 +439,16 @@ bool UDPSink::handleMessage(const Message& cmd)
     }
 }
 
-void UDPSink::setSpectrum(MessageQueue* messageQueue, bool enabled)
+void UDPSink::setSpectrum(bool enabled)
 {
     Message* cmd = MsgUDPSinkSpectrum::create(enabled);
-    messageQueue->push(cmd);
+    getInputMessageQueue()->push(cmd);
 }
 
-void UDPSink::resetReadIndex(MessageQueue* messageQueue)
+void UDPSink::resetReadIndex()
 {
     Message* cmd = MsgResetReadIndex::create();
-    messageQueue->push(cmd);
+    getInputMessageQueue()->push(cmd);
 }
 
 void UDPSink::applySettings(const UDPSinkSettings& settings, bool force)
diff --git a/plugins/channeltx/udpsink/udpsink.h b/plugins/channeltx/udpsink/udpsink.h
index bd32732ad..163e1e0c5 100644
--- a/plugins/channeltx/udpsink/udpsink.h
+++ b/plugins/channeltx/udpsink/udpsink.h
@@ -30,8 +30,6 @@
 #include "udpsinkudphandler.h"
 #include "udpsinksettings.h"
 
-class UDPSinkGUI;
-
 class UDPSink : public BasebandSampleSource {
     Q_OBJECT
 
@@ -83,7 +81,7 @@ public:
         { }
     };
 
-    UDPSink(MessageQueue* uiMessageQueue, UDPSinkGUI* udpSinkGUI, BasebandSampleSink* spectrum);
+    UDPSink(BasebandSampleSink* spectrum);
     virtual ~UDPSink();
 
     virtual void start();
@@ -96,8 +94,8 @@ public:
     int32_t getBufferGauge() const { return m_udpHandler.getBufferGauge(); }
     bool getSquelchOpen() const { return m_squelchOpen; }
 
-    void setSpectrum(MessageQueue* messageQueue, bool enabled);
-    void resetReadIndex(MessageQueue* messageQueue);
+    void setSpectrum(bool enabled);
+    void resetReadIndex();
 
 signals:
     /**
@@ -152,8 +150,6 @@ private:
     NCO m_carrierNco;
     Complex m_modSample;
 
-    MessageQueue* m_uiMessageQueue;
-    UDPSinkGUI* m_udpSinkGUI;
     BasebandSampleSink* m_spectrum;
     bool m_spectrumEnabled;
     SampleVector m_sampleBuffer;
diff --git a/plugins/channeltx/udpsink/udpsinkgui.cpp b/plugins/channeltx/udpsink/udpsinkgui.cpp
index f9d96a5fc..09781b103 100644
--- a/plugins/channeltx/udpsink/udpsinkgui.cpp
+++ b/plugins/channeltx/udpsink/udpsinkgui.cpp
@@ -122,7 +122,7 @@ UDPSinkGUI::UDPSinkGUI(PluginAPI* pluginAPI, DeviceSinkAPI *deviceAPI, QWidget*
     setAttribute(Qt::WA_DeleteOnClose, true);
 
     m_spectrumVis = new SpectrumVis(ui->glSpectrum);
-    m_udpSink = new UDPSink(m_pluginAPI->getMainWindowMessageQueue(), this, m_spectrumVis);
+    m_udpSink = new UDPSink(m_spectrumVis);
     m_udpSink->setMessageQueueToGUI(getInputMessageQueue());
     m_channelizer = new UpChannelizer(m_udpSink);
     m_threadedChannelizer = new ThreadedBasebandSampleSource(m_channelizer, this);
@@ -402,7 +402,7 @@ void UDPSinkGUI::on_applyBtn_clicked()
 
 void UDPSinkGUI::on_resetUDPReadIndex_clicked()
 {
-    m_udpSink->resetReadIndex(m_udpSink->getInputMessageQueue());
+    m_udpSink->resetReadIndex();
 }
 
 void UDPSinkGUI::on_autoRWBalance_toggled(bool checked)
@@ -421,7 +421,7 @@ void UDPSinkGUI::onWidgetRolled(QWidget* widget, bool rollDown)
 {
     if ((widget == ui->spectrumBox) && (m_udpSink != 0))
     {
-        m_udpSink->setSpectrum(m_udpSink->getInputMessageQueue(), rollDown);
+        m_udpSink->setSpectrum(rollDown);
     }
 }