1 files changed, 3 insertions, 1 deletions

diff --git a/firmware/id3.c b/firmware/id3.c
index 30e74dcdc3..c7d8f762af 100644
--- a/firmware/id3.c
+++ b/firmware/id3.c
@@ -612,7 +612,9 @@ static int getsonglength(int fd, struct mp3entry *entry)
     }
 
     DEBUGF("Old ID3V2 length: %x\n", entry->id3v2len);
-    entry->id3v2len = bytecount;
+    /* Adjust the tag length only if there is a tag present */
+    if(entry->id3v2len)
+        entry->id3v2len = bytecount;
     DEBUGF("New ID3V2 length: %x\n", bytecount);
     
     return filetime;