diff --git a/src/libtomahawk/Pipeline.cpp b/src/libtomahawk/Pipeline.cpp
index 944a00176..d6aa69bf3 100644
--- a/src/libtomahawk/Pipeline.cpp
+++ b/src/libtomahawk/Pipeline.cpp
@@ -148,7 +148,10 @@ Pipeline::removeResolver( Resolver* r )
 
     tDebug() << "Removed resolver:" << r->name();
     d->resolvers.removeAll( r );
-    emit resolverRemoved( r );
+    if ( d->running ) {
+        // Only notify if Pipeline is still active.
+        emit resolverRemoved( r );
+    }
 }