diff --git a/src/libtomahawk/resolvers/QtScriptResolver.cpp b/src/libtomahawk/resolvers/QtScriptResolver.cpp
index b99a8e3cf..1bfa4ea5e 100644
--- a/src/libtomahawk/resolvers/QtScriptResolver.cpp
+++ b/src/libtomahawk/resolvers/QtScriptResolver.cpp
@@ -231,7 +231,9 @@ QtScriptResolver::QtScriptResolver( const QString& scriptPath )
 
 QtScriptResolver::~QtScriptResolver()
 {
-    Tomahawk::Pipeline::instance()->removeResolver( this );
+    if ( !m_stopped )
+        stop();
+
     delete m_engine;
 }