diff --git a/androidApp/main/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/PlaylistSongJoin.kt b/androidApp/main/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/PlaylistSongJoin.kt
index 494fbd951..89d23d850 100644
--- a/androidApp/main/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/PlaylistSongJoin.kt
+++ b/androidApp/main/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/data/room/entity/PlaylistSongJoin.kt
@@ -30,9 +30,8 @@ import androidx.room.PrimaryKey
 data class PlaylistSongJoin(
     val playlistId: Long,
     val songId: Long,
+    val sortOrder: Long
 ) {
     @PrimaryKey(autoGenerate = true)
     var id: Long = 0
-
-    var sortOrder: Long = id
 }
diff --git a/androidApp/main/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalPlaylistRepository.kt b/androidApp/main/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalPlaylistRepository.kt
index 6350c42a5..8e18f09ea 100644
--- a/androidApp/main/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalPlaylistRepository.kt
+++ b/androidApp/main/mediaprovider/local/src/main/java/com/simplecityapps/localmediaprovider/local/repository/LocalPlaylistRepository.kt
@@ -80,7 +80,15 @@ class LocalPlaylistRepository(
                 externalId = externalId
             )
         )
-        playlistSongJoinDao.insert(songs.orEmpty().map { song -> PlaylistSongJoin(playlistId, song.id) })
+        playlistSongJoinDao.insert(
+            songs.orEmpty().mapIndexed { i, song ->
+                PlaylistSongJoin(
+                    playlistId = playlistId,
+                    songId = song.id,
+                    sortOrder = i.toLong()
+                )
+            }
+        )
         val playlist = playlistDataDao.getPlaylist(playlistId)
         Timber.v("Created playlist: ${playlist.name} with ${playlist.songCount} songs}")
         return playlist
@@ -88,10 +96,11 @@ class LocalPlaylistRepository(
 
     override suspend fun addToPlaylist(playlist: Playlist, songs: List<Song>) {
         return playlistSongJoinDao.insert(
-            songs.map { song ->
+            songs.mapIndexed { i, song ->
                 PlaylistSongJoin(
                     playlistId = playlist.id,
-                    songId = song.id
+                    songId = song.id,
+                    sortOrder = (playlist.songCount + i).toLong()
                 )
             }
         )
@@ -151,10 +160,11 @@ class LocalPlaylistRepository(
     override suspend fun updatePlaylistSongsSortOder(playlist: Playlist, playlistSongs: List<PlaylistSong>) {
         playlistSongJoinDao.updateSortOrder(
             playlistSongs.map { playlistSong ->
-                PlaylistSongJoin(playlist.id, playlistSong.song.id).apply {
-                    id = playlistSong.id
+                PlaylistSongJoin(
+                    playlistId = playlist.id,
+                    songId = playlistSong.song.id,
                     sortOrder = playlistSong.sortOrder
-                }
+                )
             }
         )
     }