diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 07176c4..a8b0131 100755
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -11,8 +11,8 @@ android {
         applicationId = "com.craftworks.music"
         minSdk = 30
         targetSdk = 34
-        versionCode = 210
-        versionName = "1.21"
+        versionCode = 211
+        versionName = "1.21.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
diff --git a/app/src/main/java/com/craftworks/music/player/SongHelper.kt b/app/src/main/java/com/craftworks/music/player/SongHelper.kt
index 4042349..c53542b 100755
--- a/app/src/main/java/com/craftworks/music/player/SongHelper.kt
+++ b/app/src/main/java/com/craftworks/music/player/SongHelper.kt
@@ -70,7 +70,7 @@ class SongHelper {
                 val currentTrackIndex = currentTracklist.indexOfFirst { it.mediaId == url.toString() }
                 currentSong = songsList.sortedBy { it.title }[currentTrackIndex]
 
-                mediaController?.setMediaItems(currentTracklist)
+                mediaController?.setMediaItems(currentTracklist, currentTrackIndex, 0)
                 mediaController?.seekToDefaultPosition(currentTrackIndex)
                 mediaController?.prepare()
                 mediaController?.play()