diff --git a/src/libtomahawk/playlist/PlayableModel.cpp b/src/libtomahawk/playlist/PlayableModel.cpp
index c2debd7f9..df8d9c096 100644
--- a/src/libtomahawk/playlist/PlayableModel.cpp
+++ b/src/libtomahawk/playlist/PlayableModel.cpp
@@ -706,13 +706,16 @@ PlayableModel::onPlaybackStopped()
 void
 PlayableModel::ensureResolved()
 {
-    for( int i = 0; i < rowCount( QModelIndex() ); i++ )
+    QList< query_ptr > ql;
+    for ( int i = 0; i < rowCount( QModelIndex() ); i++ )
     {
         query_ptr query = itemFromIndex( index( i, 0, QModelIndex() ) )->query();
 
         if ( !query->resolvingFinished() )
-            Pipeline::instance()->resolve( query );
+            ql << query;
     }
+
+    Pipeline::instance()->resolve( ql );
 }