diff --git a/src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp b/src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp
index 5f7e8a396..c97fcf558 100644
--- a/src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp
+++ b/src/libtomahawk/database/DatabaseCommand_AllAlbums.cpp
@@ -77,7 +77,7 @@ DatabaseCommand_AllAlbums::execForArtist( DatabaseImpl* dbi )
         }
 
         filterToken = QString( "AND artist.id = file_join.artist AND file_join.track = track.id %1" ).arg( filtersql );
-        tables = "artist, track, file, file_join";
+        tables = "file, file_join, artist, track";
     }
     else
         tables = "file, file_join";
@@ -139,7 +139,7 @@ DatabaseCommand_AllAlbums::execForCollection( DatabaseImpl* dbi )
 
     QString sql = QString(
         "SELECT DISTINCT album.id, album.name, album.artist, artist.name "
-        "FROM album, file, file_join "
+        "FROM file, file_join, album "
         "LEFT OUTER JOIN artist ON album.artist = artist.id "
         "WHERE file.id = file_join.file "
         "AND file_join.album = album.id "