diff --git a/src/libtomahawk/playlist/QueueProxyModel.cpp b/src/libtomahawk/playlist/QueueProxyModel.cpp
index e544eb645..2a9fd5f4f 100644
--- a/src/libtomahawk/playlist/QueueProxyModel.cpp
+++ b/src/libtomahawk/playlist/QueueProxyModel.cpp
@@ -50,7 +50,8 @@ QueueProxyModel::onPlaybackStarted( const Tomahawk::result_ptr& result )
     {
         QModelIndex idx = index( i, 0 );
         PlayableItem* item = itemFromIndex( mapToSource( idx ) );
-        if ( item && item->query() && item->query()->equals( result->toQuery() ) )
+        if ( item && item->query() && ( item->query()->results().contains( result ) ||
+                                        item->query()->equals( result->toQuery() ) ) )
             remove( idx );
     }
 }