diff --git a/plugins/channelrx/demoddsd/dsddemod.cpp b/plugins/channelrx/demoddsd/dsddemod.cpp
index 955bc61ad..6fa5a6bb0 100644
--- a/plugins/channelrx/demoddsd/dsddemod.cpp
+++ b/plugins/channelrx/demoddsd/dsddemod.cpp
@@ -59,6 +59,7 @@ DSDDemod::DSDDemod(DeviceAPI *deviceAPI) :
 
     m_thread = new QThread(this);
     m_basebandSink = new DSDDemodBaseband();
+    m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(m_thread);
 
     applySettings(m_settings, true);
diff --git a/plugins/channelrx/demoddsd/dsddemodbaseband.cpp b/plugins/channelrx/demoddsd/dsddemodbaseband.cpp
index 81e4f6c99..85fffbccf 100644
--- a/plugins/channelrx/demoddsd/dsddemodbaseband.cpp
+++ b/plugins/channelrx/demoddsd/dsddemodbaseband.cpp
@@ -61,6 +61,11 @@ void DSDDemodBaseband::reset()
     m_sampleFifo.reset();
 }
 
+void DSDDemodBaseband::setChannel(ChannelAPI *channel)
+{
+    m_sink.setChannel(channel);
+}
+
 void DSDDemodBaseband::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end)
 {
     m_sampleFifo.write(begin, end);
@@ -178,4 +183,4 @@ void DSDDemodBaseband::setBasebandSampleRate(int sampleRate)
 {
     m_channelizer->setBasebandSampleRate(sampleRate);
     m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
-}
\ No newline at end of file
+}
diff --git a/plugins/channelrx/demoddsd/dsddemodbaseband.h b/plugins/channelrx/demoddsd/dsddemodbaseband.h
index 64dc296c8..dbdc25d13 100644
--- a/plugins/channelrx/demoddsd/dsddemodbaseband.h
+++ b/plugins/channelrx/demoddsd/dsddemodbaseband.h
@@ -28,6 +28,7 @@
 #include "dsddemodsink.h"
 
 class DownChannelizer;
+class ChannelAPI;
 
 class DSDDemodBaseband : public QObject
 {
@@ -71,6 +72,7 @@ public:
 	void configureMyPosition(float myLatitude, float myLongitude) { m_sink.configureMyPosition(myLatitude, myLongitude); }
    	const DSDDecoder& getDecoder() const { return m_sink.getDecoder(); }
     const char *updateAndGetStatusText() { return m_sink.updateAndGetStatusText(); }
+    void setChannel(ChannelAPI *channel);
 
 private:
     SampleSinkFifo m_sampleFifo;
@@ -88,4 +90,4 @@ private slots:
     void handleData(); //!< Handle data when samples have to be processed
 };
 
-#endif // INCLUDE_DSDDEMODBASEBAND_H
\ No newline at end of file
+#endif // INCLUDE_DSDDEMODBASEBAND_H
diff --git a/plugins/channelrx/demoddsd/dsddemodsink.cpp b/plugins/channelrx/demoddsd/dsddemodsink.cpp
index 7dd35be8e..d7ad83104 100644
--- a/plugins/channelrx/demoddsd/dsddemodsink.cpp
+++ b/plugins/channelrx/demoddsd/dsddemodsink.cpp
@@ -33,8 +33,11 @@
 
 #include "dsp/dspengine.h"
 #include "dsp/basebandsamplesink.h"
+#include "dsp/datafifo.h"
 #include "audio/audiooutputdevice.h"
 #include "util/db.h"
+#include "util/messagequeue.h"
+#include "maincore.h"
 
 #include "dsddemodsink.h"
 
@@ -59,6 +62,8 @@ DSDDemodSink::DSDDemodSink() :
 {
 	m_audioBuffer.resize(1<<14);
 	m_audioBufferFill = 0;
+    m_demodBuffer.resize(1<<12);
+    m_demodBufferFill = 0;
 
 	m_sampleBuffer = new FixReal[1<<17]; // 128 kS
 	m_sampleBufferIndex = 0;
@@ -170,6 +175,25 @@ void DSDDemodSink::feed(const SampleVector::const_iterator& begin, const SampleV
 
             m_dsdDecoder.pushSample(sampleDSD);
 
+            m_demodBuffer[m_demodBufferFill] = sampleDSD;
+            ++m_demodBufferFill;
+
+            if (m_demodBufferFill >= m_demodBuffer.size())
+            {
+                QList<DataFifo*> *dataFifos = MainCore::instance()->getDataPipes().getFifos(m_channel, "demod");
+
+                if (dataFifos)
+                {
+                    QList<DataFifo*>::iterator it = dataFifos->begin();
+
+                    for (; it != dataFifos->end(); ++it) {
+                        (*it)->write((quint8*) &m_demodBuffer[0], m_demodBuffer.size() * sizeof(qint16));
+                    }
+                }
+
+                m_demodBufferFill = 0;
+            }
+
             if (m_settings.m_enableCosineFiltering) { // show actual input to FSK demod
             	sample = m_dsdDecoder.getFilteredSample() * m_scaleFromShort;
             }
@@ -297,6 +321,19 @@ void DSDDemodSink::applyAudioSampleRate(int sampleRate)
 
     m_dsdDecoder.setUpsampling(upsampling);
     m_audioSampleRate = sampleRate;
+
+    QList<MessageQueue*> *messageQueues = MainCore::instance()->getMessagePipes().getMessageQueues(m_channel, "reportdemod");
+
+    if (messageQueues)
+    {
+        QList<MessageQueue*>::iterator it = messageQueues->begin();
+
+        for (; it != messageQueues->end(); ++it)
+        {
+            MainCore::MsgChannelDemodReport *msg = MainCore::MsgChannelDemodReport::create(m_channel, sampleRate);
+            (*it)->push(msg);
+        }
+    }
 }
 
 void DSDDemodSink::applyChannelSettings(int channelSampleRate, int channelFrequencyOffset, bool force)
diff --git a/plugins/channelrx/demoddsd/dsddemodsink.h b/plugins/channelrx/demoddsd/dsddemodsink.h
index e0be6b9d1..7ce2cb8a1 100644
--- a/plugins/channelrx/demoddsd/dsddemodsink.h
+++ b/plugins/channelrx/demoddsd/dsddemodsink.h
@@ -18,6 +18,8 @@
 #ifndef INCLUDE_DSDDEMODSINK_H
 #define INCLUDE_DSDDEMODSINK_H
 
+#include <QVector>
+
 #include "dsp/channelsamplesink.h"
 #include "dsp/phasediscri.h"
 #include "dsp/nco.h"
@@ -33,6 +35,7 @@
 #include "dsddecoder.h"
 
 class BasebandSampleSink;
+class ChannelAPI;
 
 class DSDDemodSink : public ChannelSampleSink {
 public:
@@ -47,6 +50,7 @@ public:
     AudioFifo *getAudioFifo1() { return &m_audioFifo1; }
     AudioFifo *getAudioFifo2() { return &m_audioFifo2; }
     int getAudioSampleRate() const { return m_audioSampleRate; }
+    void setChannel(ChannelAPI *channel) { m_channel = channel; }
 
 	void setScopeXYSink(BasebandSampleSink* scopeSink) { m_scopeXY = scopeSink; }
 	void configureMyPosition(float myLatitude, float myLongitude);
@@ -105,7 +109,10 @@ private:
     int m_channelSampleRate;
 	int m_channelFrequencyOffset;
 	DSDDemodSettings m_settings;
+    ChannelAPI *m_channel;
     int m_audioSampleRate;
+    QVector<qint16> m_demodBuffer;
+    int m_demodBufferFill;
 
 	NCO m_nco;
 	Interpolator m_interpolator;
@@ -146,4 +153,4 @@ private:
     void formatStatusText();
 };
 
-#endif // INCLUDE_DSDDEMODSINK_H
\ No newline at end of file
+#endif // INCLUDE_DSDDEMODSINK_H
diff --git a/plugins/channelrx/demodnfm/nfmdemod.cpp b/plugins/channelrx/demodnfm/nfmdemod.cpp
index 5dea77375..8765de855 100644
--- a/plugins/channelrx/demodnfm/nfmdemod.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemod.cpp
@@ -58,6 +58,7 @@ NFMDemod::NFMDemod(DeviceAPI *devieAPI) :
 
     m_thread = new QThread(this);
     m_basebandSink = new NFMDemodBaseband();
+    m_basebandSink->setChannel(this);
     m_basebandSink->moveToThread(m_thread);
 
 	applySettings(m_settings, true);
diff --git a/plugins/channelrx/demodnfm/nfmdemodbaseband.cpp b/plugins/channelrx/demodnfm/nfmdemodbaseband.cpp
index f7b88cb96..c82e2d342 100644
--- a/plugins/channelrx/demodnfm/nfmdemodbaseband.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemodbaseband.cpp
@@ -58,6 +58,11 @@ void NFMDemodBaseband::reset()
     m_sampleFifo.reset();
 }
 
+void NFMDemodBaseband::setChannel(ChannelAPI *channel)
+{
+    m_sink.setChannel(channel);
+}
+
 void NFMDemodBaseband::feed(const SampleVector::const_iterator& begin, const SampleVector::const_iterator& end)
 {
     m_sampleFifo.write(begin, end);
@@ -173,4 +178,4 @@ void NFMDemodBaseband::setBasebandSampleRate(int sampleRate)
 {
     m_channelizer->setBasebandSampleRate(sampleRate);
     m_sink.applyChannelSettings(m_channelizer->getChannelSampleRate(), m_channelizer->getChannelFrequencyOffset());
-}
\ No newline at end of file
+}
diff --git a/plugins/channelrx/demodnfm/nfmdemodbaseband.h b/plugins/channelrx/demodnfm/nfmdemodbaseband.h
index 40363341f..3a68c5992 100644
--- a/plugins/channelrx/demodnfm/nfmdemodbaseband.h
+++ b/plugins/channelrx/demodnfm/nfmdemodbaseband.h
@@ -28,6 +28,7 @@
 #include "nfmdemodsink.h"
 
 class DownChannelizer;
+class ChannelAPI;
 
 class NFMDemodBaseband : public QObject
 {
@@ -69,6 +70,7 @@ public:
     void setMessageQueueToGUI(MessageQueue *messageQueue) { m_sink.setMessageQueueToGUI(messageQueue); }
     int getAudioSampleRate() const { return m_sink.getAudioSampleRate(); }
     void setBasebandSampleRate(int sampleRate);
+    void setChannel(ChannelAPI *channel);
 
 private:
     SampleSinkFifo m_sampleFifo;
@@ -86,4 +88,4 @@ private slots:
     void handleData(); //!< Handle data when samples have to be processed
 };
 
-#endif // INCLUDE_NFMDEMODBASEBAND_H
\ No newline at end of file
+#endif // INCLUDE_NFMDEMODBASEBAND_H
diff --git a/plugins/channelrx/demodnfm/nfmdemodsink.cpp b/plugins/channelrx/demodnfm/nfmdemodsink.cpp
index 6b9ff3423..68a63e45a 100644
--- a/plugins/channelrx/demodnfm/nfmdemodsink.cpp
+++ b/plugins/channelrx/demodnfm/nfmdemodsink.cpp
@@ -23,12 +23,15 @@
 
 #include "util/stepfunctions.h"
 #include "util/db.h"
+#include "util/messagequeue.h"
 #include "audio/audiooutputdevice.h"
 #include "dsp/dspengine.h"
 #include "dsp/dspcommands.h"
 #include "dsp/devicesamplemimo.h"
 #include "dsp/misc.h"
+#include "dsp/datafifo.h"
 #include "device/deviceapi.h"
+#include "maincore.h"
 
 #include "nfmdemodreport.h"
 #include "nfmdemodsink.h"
@@ -62,6 +65,8 @@ NFMDemodSink::NFMDemodSink() :
         m_messageQueueToGUI(nullptr)
 {
     m_audioBuffer.resize(1<<16);
+    m_demodBuffer.resize(1<<12);
+    m_demodBufferFill = 0;
 
     applySettings(m_settings, true);
     applyChannelSettings(m_channelSampleRate, m_channelFrequencyOffset, true);
@@ -219,6 +224,25 @@ void NFMDemodSink::processOneSample(Complex &ci)
 
         m_audioBufferFill = 0;
     }
+
+    m_demodBuffer[m_demodBufferFill] = sample;
+    ++m_demodBufferFill;
+
+    if (m_demodBufferFill >= m_demodBuffer.size())
+    {
+        QList<DataFifo*> *dataFifos = MainCore::instance()->getDataPipes().getFifos(m_channel, "demod");
+
+        if (dataFifos)
+        {
+            QList<DataFifo*>::iterator it = dataFifos->begin();
+
+            for (; it != dataFifos->end(); ++it) {
+                (*it)->write((quint8*) &m_demodBuffer[0], m_demodBuffer.size() * sizeof(qint16));
+            }
+        }
+
+        m_demodBufferFill = 0;
+    }
 }
 
 
@@ -343,4 +367,17 @@ void NFMDemodSink::applyAudioSampleRate(unsigned int sampleRate)
     m_interpolatorDistance = Real(m_channelSampleRate) / Real(sampleRate);
     m_interpolatorDistanceRemain = m_interpolatorDistance;
     m_audioSampleRate = sampleRate;
+
+    QList<MessageQueue*> *messageQueues = MainCore::instance()->getMessagePipes().getMessageQueues(m_channel, "reportdemod");
+
+    if (messageQueues)
+    {
+        QList<MessageQueue*>::iterator it = messageQueues->begin();
+
+        for (; it != messageQueues->end(); ++it)
+        {
+            MainCore::MsgChannelDemodReport *msg = MainCore::MsgChannelDemodReport::create(m_channel, sampleRate);
+            (*it)->push(msg);
+        }
+    }
 }
diff --git a/plugins/channelrx/demodnfm/nfmdemodsink.h b/plugins/channelrx/demodnfm/nfmdemodsink.h
index 3ddee07e4..432fb10f9 100644
--- a/plugins/channelrx/demodnfm/nfmdemodsink.h
+++ b/plugins/channelrx/demodnfm/nfmdemodsink.h
@@ -18,7 +18,7 @@
 #ifndef INCLUDE_NFMDEMODSINK_H
 #define INCLUDE_NFMDEMODSINK_H
 
-#include <vector>
+#include <QVector>
 
 #include "dsp/channelsamplesink.h"
 #include "dsp/phasediscri.h"
@@ -35,6 +35,8 @@
 
 #include "nfmdemodsettings.h"
 
+class ChannelAPI;
+
 class NFMDemodSink : public ChannelSampleSink {
 public:
     NFMDemodSink();
@@ -77,6 +79,7 @@ public:
     AudioFifo *getAudioFifo() { return &m_audioFifo; }
     void applyAudioSampleRate(unsigned int sampleRate);
     int getAudioSampleRate() const { return m_audioSampleRate; }
+    void setChannel(ChannelAPI *channel) { m_channel = channel; }
 
 private:
     struct MagSqLevelsStore
@@ -97,11 +100,14 @@ private:
     int m_channelSampleRate;
     int m_channelFrequencyOffset;
     NFMDemodSettings m_settings;
+    ChannelAPI *m_channel;
 
     int m_audioSampleRate;
     AudioVector m_audioBuffer;
     uint m_audioBufferFill;
     AudioFifo m_audioFifo;
+    QVector<qint16> m_demodBuffer;
+    int m_demodBufferFill;
 
     NCO m_nco;
     Interpolator m_interpolator;