1 files changed, 3 insertions, 0 deletions

diff --git a/apps/playback.c b/apps/playback.c
index 203fe8ce4a..8a382c5a2f 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -2007,6 +2007,7 @@ static bool load_next_track(void) {
     {
         ci.new_track++;
         automatic_skip = true;
+        playlist_end = false;
     }
     
     cpu_boost(true);
@@ -2030,6 +2031,8 @@ static bool load_next_track(void) {
         case Q_CODEC_REQUEST_FAILED:
             ci.new_track = 0;
             ci.stop_codec = true;
+            if (automatic_skip)
+                playlist_end = true;
             return false;
         default:
             logf("Bad event on ccq");