diff --git a/code/handlers/releasehandler.lua b/code/handlers/releasehandler.lua
index bc5a8c7..4cc5c3f 100644
--- a/code/handlers/releasehandler.lua
+++ b/code/handlers/releasehandler.lua
@@ -26,10 +26,14 @@ local function Releasehandler(self)
   end
 
   local tracks = db.query([[
-        SELECT track.name AS track_name, track.id
+        SELECT track.name AS track_name, track.id, artist.name AS artist_name
         FROM track_releases
         INNER JOIN
             tracks AS track ON (track_releases.track = track.id)
+            INNER JOIN
+                track_artists AS track_artist ON (track_artist.track = track.id)
+                INNER JOIN
+                    artists AS artist ON (track_artist.artist = artist.id)
         WHERE track_releases.release = ?
   ]], release["id"])