diff --git a/sdrbase/dsp/threadedbasebandsamplesink.cpp b/sdrbase/dsp/threadedbasebandsamplesink.cpp
index 71ded353e..536b3e6cd 100644
--- a/sdrbase/dsp/threadedbasebandsamplesink.cpp
+++ b/sdrbase/dsp/threadedbasebandsamplesink.cpp
@@ -88,6 +88,7 @@ ThreadedBasebandSampleSink::ThreadedBasebandSampleSink(BasebandSampleSink* sampl
 
 ThreadedBasebandSampleSink::~ThreadedBasebandSampleSink()
 {
+    stop();
 	delete m_threadedBasebandSampleSinkFifo; // Valgrind memcheck
 	delete m_thread;
 }
diff --git a/sdrbase/dsp/threadedbasebandsamplesource.cpp b/sdrbase/dsp/threadedbasebandsamplesource.cpp
index 57b8b125a..d8fbf3c06 100644
--- a/sdrbase/dsp/threadedbasebandsamplesource.cpp
+++ b/sdrbase/dsp/threadedbasebandsamplesource.cpp
@@ -36,6 +36,7 @@ ThreadedBasebandSampleSource::ThreadedBasebandSampleSource(BasebandSampleSource*
 
 ThreadedBasebandSampleSource::~ThreadedBasebandSampleSource()
 {
+    stop();
     delete m_thread;
 }