diff --git a/src/libtomahawk/resolvers/ScriptResolver.cpp b/src/libtomahawk/resolvers/ScriptResolver.cpp
index 2392c5893..3b7c58276 100644
--- a/src/libtomahawk/resolvers/ScriptResolver.cpp
+++ b/src/libtomahawk/resolvers/ScriptResolver.cpp
@@ -69,7 +69,7 @@ ScriptResolver::~ScriptResolver()
     msg[ "_msgtype" ] = "quit";
     sendMessage( msg );
 
-    bool finished = m_proc.waitForFinished( 2500 ); // might call handleMsg
+    bool finished = m_proc.state() != QProcess::Running || m_proc.waitForFinished( 2500 ); // might call handleMsg
 
     Tomahawk::Pipeline::instance()->removeResolver( this );