1 files changed, 4 insertions, 2 deletions

diff --git a/firmware/mpeg.c b/firmware/mpeg.c
index 606b724241..a6c6783beb 100644
--- a/firmware/mpeg.c
+++ b/firmware/mpeg.c
@@ -1512,7 +1512,8 @@ void mpeg_play(int offset)
             break;
         if(mp3info(&taginfo, trackname)) {
             /* bad mp3, move on */
-            steps++;
+            if(++steps > playlist_amount())
+                break;
             continue;
         }
         playlist_next(steps);
@@ -1575,7 +1576,8 @@ void mpeg_next(void)
         if(!file)
             break;
         if(mp3info(&taginfo, file)) {
-            steps++;
+            if(++steps > playlist_amount())
+                break;
             continue;
         }
         index = playlist_next(steps);