1 files changed, 4 insertions, 1 deletions

diff --git a/apps/playback.c b/apps/playback.c
index d3f8a1afa5..203fe8ce4a 100644
--- a/apps/playback.c
+++ b/apps/playback.c
@@ -894,6 +894,10 @@ static void audio_rebuffer(void)
     last_peek_offset = -1;
     cur_ti->filesize = 0;
     cur_ti->start_pos = 0;
+
+    if (!cur_ti->taginfo_ready)
+        memset(&cur_ti->id3, 0, sizeof(struct mp3entry));
+
     audio_fill_file_buffer(false, true, 0);
 }
 
@@ -909,7 +913,6 @@ static void audio_check_new_track(void)
         if (playlist_next_dir(ci.new_track))
         {
             ci.new_track = 0;
-            memset(&cur_ti->id3, 0, sizeof(struct mp3entry));
             cur_ti->taginfo_ready = false;
             audio_rebuffer();
             goto skip_done;