diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt
index 919442a..d6c7535 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/service/PlayerService.kt
@@ -450,14 +450,16 @@ class PlayerService : InvincibleService(), Player.Listener, PlaybackStatsListene
             if (notification == null) {
                 isNotificationStarted = false
                 makeInvincible(false)
-                stopForeground(true)
+                stopForeground(false)
+                sendCloseEqualizerIntent()
+                notificationManager?.cancel(NotificationId)
                 return
             }
 
             if (player.shouldBePlaying && !isNotificationStarted) {
                 isNotificationStarted = true
                 startForegroundService(this@PlayerService, intent<PlayerService>())
-                startForeground(NotificationId, notification())
+                startForeground(NotificationId, notification)
                 makeInvincible(false)
                 sendOpenEqualizerIntent()
             } else {
diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Player.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Player.kt
index f4d4452..4f5da46 100644
--- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Player.kt
+++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/Player.kt
@@ -52,12 +52,13 @@ fun Player.forcePlayAtIndex(mediaItems: List<MediaItem>, mediaItemIndex: Int) {
 fun Player.forcePlayFromBeginning(mediaItems: List<MediaItem>) =
     forcePlayAtIndex(mediaItems, 0)
 
-fun Player.forceSeekToPrevious() =
+fun Player.forceSeekToPrevious() {
     if (hasPreviousMediaItem() || currentPosition > maxSeekToPreviousPosition) {
         seekToPrevious()
-    }else {
+    } else if (mediaItemCount > 0) {
         seekTo(mediaItemCount - 1, C.TIME_UNSET)
     }
+}
 
 fun Player.forceSeekToNext() =
     if (hasNextMediaItem()) seekToNext() else seekTo(0, C.TIME_UNSET)