diff --git a/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt b/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt
index afe3dd2..c22ab6e 100644
--- a/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt
+++ b/app/src/main/java/com/github/apognu/otter/playback/PlayerService.kt
@@ -396,8 +396,10 @@ class PlayerService : Service() {
     override fun onPlayerError(error: ExoPlaybackException?) {
       EventBus.send(Event.PlaybackError(getString(R.string.error_playback)))
 
-      player.next()
-      player.playWhenReady = true
+      queue.current()?.let {
+        queue.remove(it)
+        player.prepare(queue.datasources)
+      }
     }
   }