diff --git a/app/src/main/java/net/nullsum/audinaut/service/DownloadService.java b/app/src/main/java/net/nullsum/audinaut/service/DownloadService.java
index f98004b..c68edce 100644
--- a/app/src/main/java/net/nullsum/audinaut/service/DownloadService.java
+++ b/app/src/main/java/net/nullsum/audinaut/service/DownloadService.java
@@ -1370,15 +1370,10 @@ public class DownloadService extends Service {
         final int duration = downloadFile.getSong().getDuration() == null ? 0 : downloadFile.getSong().getDuration() * 1000;
         mediaPlayer.setOnErrorListener((mediaPlayer, what, extra) -> {
             Log.w(TAG, "Error on playing file " + "(" + what + ", " + extra + "): " + downloadFile);
-            int pos = getPlayerPosition();
-            reset();
-            if (!isPartial || (downloadFile.isWorkDone() && (Math.abs(duration - pos) < 10000))) {
-                playNext();
-            } else {
-                downloadFile.setPlaying(false);
-                doPlay(downloadFile, pos, isPlaying);
-                downloadFile.setPlaying(true);
-            }
+            int index = getNextPlayingIndex();
+            remove(downloadFile);
+            downloadFile.delete();
+            play(index - 1);
             return true;
         });