diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
index f5c18a47..a6b6fe66 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
@@ -60,7 +60,7 @@ open class SongAdapter(
     }
 
     override fun getItemId(position: Int): Long {
-        return dataSet[position].id.toLong()
+        return dataSet[position].id
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
index d35a9071..2c1fa879 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
@@ -14,14 +14,10 @@ class PlaylistDetailsViewModel(
     private var playlist: PlaylistWithSongs
 ) : ViewModel(), IMusicServiceEventListener {
 
-    private val _playListSongs = MutableLiveData<List<Song>>()
-    private val _playlist = MutableLiveData<PlaylistWithSongs>().apply {
-        postValue(playlist)
-    }
+    private val playListSongs = MutableLiveData<List<Song>>()
 
-    fun getPlaylist(): LiveData<PlaylistWithSongs> = _playlist
-
-    fun getSongs(): LiveData<List<SongEntity>> = realRepository.playlistSongs(playlist.playlistEntity)
+    fun getSongs(): LiveData<List<SongEntity>> =
+        realRepository.playlistSongs(playlist.playlistEntity.playListId)
 
 
     override fun onMediaStoreChanged() {
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
index 476dac74..cbd29a90 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
@@ -42,7 +42,7 @@ interface Repository {
     fun favorites(): LiveData<List<SongEntity>>
     fun observableHistorySongs(): LiveData<List<Song>>
     fun albumById(albumId: Long): Album
-    fun playlistSongs(playlistEntity: PlaylistEntity): LiveData<List<SongEntity>>
+    fun playlistSongs(playListId: Long): LiveData<List<SongEntity>>
     suspend fun fetchAlbums(): List<Album>
     suspend fun albumByIdAsync(albumId: Long): Album
     suspend fun allSongs(): List<Song>
@@ -252,8 +252,8 @@ class RealRepository(
             it.toSong()
         }
 
-    override fun playlistSongs(playlistEntity: PlaylistEntity): LiveData<List<SongEntity>> =
-        roomRepository.getSongs(playlistEntity)
+    override fun playlistSongs(playListId: Long): LiveData<List<SongEntity>> =
+        roomRepository.getSongs(playListId)
 
     override suspend fun insertSongs(songs: List<SongEntity>) =
         roomRepository.insertSongs(songs)
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
index 4a6eb42d..ca8a9833 100644
--- a/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
@@ -11,7 +11,7 @@ interface RoomRepository {
     fun favoritePlaylistLiveData(favorite: String): LiveData<List<SongEntity>>
     fun insertBlacklistPath(blackListStoreEntity: BlackListStoreEntity)
     fun observableHistorySongs(): LiveData<List<HistoryEntity>>
-    fun getSongs(playlistEntity: PlaylistEntity): LiveData<List<SongEntity>>
+    fun getSongs(playListId: Long): LiveData<List<SongEntity>>
     suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long
     suspend fun checkPlaylistExists(playlistName: String): List<PlaylistEntity>
     suspend fun playlists(): List<PlaylistEntity>
@@ -70,8 +70,8 @@ class RealRoomRepository(
     }
 
 
-    override fun getSongs(playlistEntity: PlaylistEntity): LiveData<List<SongEntity>> =
-        playlistDao.songsFromPlaylist(playlistEntity.playListId)
+    override fun getSongs(playListId: Long): LiveData<List<SongEntity>> =
+        playlistDao.songsFromPlaylist(playListId)
 
     override suspend fun deletePlaylistEntities(playlistEntities: List<PlaylistEntity>) =
         playlistDao.deletePlaylists(playlistEntities)