diff --git a/src/libtomahawk/AlbumPlaylistInterface.cpp b/src/libtomahawk/AlbumPlaylistInterface.cpp
index 355409079..653c93df1 100644
--- a/src/libtomahawk/AlbumPlaylistInterface.cpp
+++ b/src/libtomahawk/AlbumPlaylistInterface.cpp
@@ -204,10 +204,11 @@ AlbumPlaylistInterface::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData re
 void
 AlbumPlaylistInterface::onTracksLoaded( const QList< query_ptr >& tracks )
 {
-    m_databaseLoaded = true;
-
     if ( m_collection.isNull() )
+    {
+        m_databaseLoaded = true;
         m_queries << filterTracks( tracks );
+    }
     else
         m_queries << tracks;
 
diff --git a/src/libtomahawk/ArtistPlaylistInterface.cpp b/src/libtomahawk/ArtistPlaylistInterface.cpp
index c3c5a1164..a91d06aab 100644
--- a/src/libtomahawk/ArtistPlaylistInterface.cpp
+++ b/src/libtomahawk/ArtistPlaylistInterface.cpp
@@ -202,10 +202,11 @@ ArtistPlaylistInterface::infoSystemInfo( Tomahawk::InfoSystem::InfoRequestData r
 void
 ArtistPlaylistInterface::onTracksLoaded( const QList< query_ptr >& tracks )
 {
-    m_databaseLoaded = true;
-
     if ( m_collection.isNull() )
+    {
+        m_databaseLoaded = true;
         m_queries << filterTracks( tracks );
+    }
     else
         m_queries << tracks;