diff --git a/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt b/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
index 3fd798351..dea5c7e6f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
@@ -93,6 +93,7 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
     }
 
     override fun seek(whereto: Int): Int {
+        endFade()
         getNextPlayer()?.stop()
         return try {
             getCurrentPlayer()?.seekTo(whereto)
@@ -235,6 +236,11 @@ class CrossFadePlayer(context: Context) : LocalPlayback(context) {
         crossFadeAnimator?.start()
     }
 
+    private fun endFade() {
+        crossFadeAnimator?.end()
+        crossFadeAnimator = null
+    }
+
     private fun cancelFade() {
         crossFadeAnimator?.cancel()
         crossFadeAnimator = null