diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionModel.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionModel.kt
index f0d5e4e2..2cfd9a7f 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionModel.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/fragment/TrackCollectionModel.kt
@@ -73,12 +73,11 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
                     musicDirectory.findChild(allSongsId) == null &&
                     hasOnlyFolders(musicDirectory)
                 ) {
-                    val allSongs = MusicDirectory.Entry()
+                    val allSongs = MusicDirectory.Entry(allSongsId)
 
                     allSongs.isDirectory = true
                     allSongs.artist = name
                     allSongs.parent = id
-                    allSongs.id = allSongsId
                     allSongs.title = String.format(
                         context.resources.getString(R.string.select_album_all_songs), name
                     )
@@ -135,12 +134,11 @@ class TrackCollectionModel(application: Application) : GenericListModel(applicat
                 musicDirectory.findChild(allSongsId) == null &&
                 hasOnlyFolders(musicDirectory)
             ) {
-                val allSongs = MusicDirectory.Entry()
+                val allSongs = MusicDirectory.Entry(allSongsId)
 
                 allSongs.isDirectory = true
                 allSongs.artist = name
                 allSongs.parent = id
-                allSongs.id = allSongsId
                 allSongs.title = String.format(
                     context.resources.getString(R.string.select_album_all_songs), name
                 )