diff --git a/sdrbase/dsp/dspdevicesourceengine.cpp b/sdrbase/dsp/dspdevicesourceengine.cpp
index 0f4a99a0b..58197414f 100644
--- a/sdrbase/dsp/dspdevicesourceengine.cpp
+++ b/sdrbase/dsp/dspdevicesourceengine.cpp
@@ -348,7 +348,10 @@ DSPDeviceSourceEngine::State DSPDeviceSourceEngine::gotoIdle()
 		(*it)->stop();
 	}
 
-	// TODO: why not stopping the threaded baseband sample sinks?
+    for(ThreadedBasebandSampleSinks::const_iterator it = m_threadedBasebandSampleSinks.begin(); it != m_threadedBasebandSampleSinks.end(); it++)
+    {
+        (*it)->stop();
+    }
 
 	m_deviceSampleSource->stop();
 	m_deviceDescription.clear();