diff --git a/sdrbase/gui/glscope.cpp b/sdrbase/gui/glscope.cpp
index 1ac963890..5601005e7 100644
--- a/sdrbase/gui/glscope.cpp
+++ b/sdrbase/gui/glscope.cpp
@@ -92,7 +92,10 @@ GLScope::GLScope(QWidget* parent) :
 
 GLScope::~GLScope()
 {
-	if(m_dspEngine != NULL) {
+	cleanup();
+
+	if(m_dspEngine != 0)
+	{
 		m_dspEngine->removeSink(m_scopeVis);
 		delete m_scopeVis;
 	}
diff --git a/sdrbase/gui/glspectrum.cpp b/sdrbase/gui/glspectrum.cpp
index b705fd935..18b9bf4f3 100644
--- a/sdrbase/gui/glspectrum.cpp
+++ b/sdrbase/gui/glspectrum.cpp
@@ -117,6 +117,8 @@ GLSpectrum::GLSpectrum(QWidget* parent) :
 
 GLSpectrum::~GLSpectrum()
 {
+	cleanup();
+
 	QMutexLocker mutexLocker(&m_mutex);
 
 	m_changesPending = true;