diff --git a/src/main/kotlin/dao/AudioDao.kt b/src/main/kotlin/dao/AudioDao.kt
index b910e77..56b7fa0 100644
--- a/src/main/kotlin/dao/AudioDao.kt
+++ b/src/main/kotlin/dao/AudioDao.kt
@@ -52,7 +52,6 @@
             @JvmStatic
             fun findOneById(): String = SelectSQLBuilder(AudioEntity::class)
                 .leftOuterJoin(AlbumEntity::class, "audio.album_id = album.id")
-                .leftOuterJoin(ArtistEntity::class, "audio.artist_id = artist.id")
                 .toSql()
                 .WHERE("audio.id = #{id}")
                 .toString()
@@ -60,7 +59,6 @@
             @JvmStatic
             fun findOneBySlug(): String = SelectSQLBuilder(AudioEntity::class)
                 .leftOuterJoin(AlbumEntity::class, "audio.album_id = album.id")
-                .leftOuterJoin(ArtistEntity::class, "audio.artist_id = artist.id")
                 .toSql()
                 .WHERE("audio.slug = #{slug}")
                 .toString()
@@ -69,7 +67,6 @@
             fun findAllByArtistIdIn(@Param("artistIds") artistIds: List<Long>): String =
                 SelectSQLBuilder(AudioEntity::class)
                     .leftOuterJoin(AlbumEntity::class, "audio.album_id = album.id")
-                    .leftOuterJoin(ArtistEntity::class, "audio.artist_id = artist.id")
                     .toSql()
                     .WHERE_IN("audio.artist_id", "artistIds", artistIds.size)
                     .toString()
@@ -78,7 +75,6 @@
             fun findAllByAlbumIdIn(@Param("albumIds") albumIds: List<Long>): String =
                 SelectSQLBuilder(AudioEntity::class)
                     .leftOuterJoin(AlbumEntity::class, "audio.album_id = album.id")
-                    .leftOuterJoin(ArtistEntity::class, "audio.artist_id = artist.id")
                     .toSql()
                     .WHERE_IN("audio.album_id", "albumIds", albumIds.size)
                     .toString()
@@ -87,7 +83,6 @@
             fun findAllByIdIn(@Param("ids") ids: List<Long>): String =
                 SelectSQLBuilder(AudioEntity::class)
                     .leftOuterJoin(AlbumEntity::class, "audio.album_id = album.id")
-                    .leftOuterJoin(ArtistEntity::class, "audio.artist_id = artist.id")
                     .toSql()
                     .WHERE_IN("audio.id", "ids", ids.size)
                     .toString()
@@ -96,7 +91,6 @@
             fun findAllBySlugIn(@Param("slugs") slugs: List<String>): String =
                 SelectSQLBuilder(AudioEntity::class)
                     .leftOuterJoin(AlbumEntity::class, "audio.album_id = album.id")
-                    .leftOuterJoin(ArtistEntity::class, "audio.artist_id = artist.id")
                     .toSql()
                     .WHERE_IN("audio.slug", "slugs", slugs.size)
                     .toString()
@@ -108,7 +102,6 @@
             ): String =
                 SelectSQLBuilder(AudioEntity::class)
                     .leftOuterJoin(AlbumEntity::class, "audio.album_id = album.id")
-                    .leftOuterJoin(ArtistEntity::class, "audio.artist_id = artist.id")
                     .toSql()
                     .WHERE("audio.name LIKE CONCAT('%', #{nameLike}, '%')")
                     .LIMIT("#{limit}")
diff --git a/src/main/kotlin/entity/Audio.kt b/src/main/kotlin/entity/Audio.kt
index 5c1ca01..0363347 100644
--- a/src/main/kotlin/entity/Audio.kt
+++ b/src/main/kotlin/entity/Audio.kt
@@ -16,14 +16,11 @@
     var slug: String = "",
     @property:Column("name")
     var name: String = "",
-    @property:Column("artist_id")
-    var artistId: Long = 0L,
     @property:Column("album_id")
     var albumId: Long = 0L,
     @property:Column("path")
     var path: String = "",
     // join
-    var artist: ArtistEntity? = null,
     var album: AlbumEntity? = null
 )
 
@@ -31,8 +28,12 @@
 data class AlbumEntity(
     @property:Column("id", insertable = false, updatable = false)
     var id: Long = 0L,
+    @property:Column("artist_id")
+    var artistId: Long = 0L,
     @property:Column("name")
     var name: String = "",
+    // join
+    var artist: ArtistEntity? = null
 )
 
 @Table("artist")
diff --git a/src/main/kotlin/model/api/Audio.kt b/src/main/kotlin/model/api/Audio.kt
index e27178c..e3557a0 100644
--- a/src/main/kotlin/model/api/Audio.kt
+++ b/src/main/kotlin/model/api/Audio.kt
@@ -17,7 +17,7 @@
     ) {
         val name: String = entity.name
         val slug: String = entity.slug
-        val artist: String? = entity?.artist?.name
+        val artist: String? = entity?.album?.artist?.name
         val album: String? = entity?.album?.name
     }
 }
\ No newline at end of file
diff --git a/src/main/kotlin/model/api/Playlist.kt b/src/main/kotlin/model/api/Playlist.kt
index 7184c1f..dea3de4 100644
--- a/src/main/kotlin/model/api/Playlist.kt
+++ b/src/main/kotlin/model/api/Playlist.kt
@@ -46,7 +46,7 @@
     class Audio(private val entity: AudioEntity) {
         val name: String = entity.name
         val slug: String = entity.slug
-        val artist: String? = entity.artist?.name
+        val artist: String? = entity.album?.artist?.name
         val album: String? = entity.album?.name
     }
 }
diff --git a/src/main/resources/mapper/mapper.xml b/src/main/resources/mapper/mapper.xml
index 32485f7..e8f7a6a 100644
--- a/src/main/resources/mapper/mapper.xml
+++ b/src/main/resources/mapper/mapper.xml
@@ -10,12 +10,12 @@
     <result property="albumId" column="album_id"/>
     <result property="path" column="path"/>
     <association property="album" columnPrefix="album__" resultMap="AlbumEntity"/>
-    <association property="artist" columnPrefix="artist__" resultMap="ArtistEntity"/>
   </resultMap>
 
   <resultMap id="ArtistEntity" type="net.piedpiper.bremer.entity.ArtistEntity">
     <id property="id" column="id"/>
     <result property="name" column="name"/>
+    <association property="artist" columnPrefix="artist__" resultMap="ArtistEntity"/>
   </resultMap>
 
   <resultMap id="AlbumEntity" type="net.piedpiper.bremer.entity.AlbumEntity">