diff --git a/lib/rbcodec/metadata/mp4.c b/lib/rbcodec/metadata/mp4.c
index 7901f4678d..a23dbb9619 100644
--- a/lib/rbcodec/metadata/mp4.c
+++ b/lib/rbcodec/metadata/mp4.c
@@ -482,10 +482,7 @@ static bool read_mp4_tags(int fd, struct mp3entry* id3,
             break;
 
         case MP4_trkn: {
-            int tracknum = 0;
-            read_mp4_tag_i_from_n(fd, &tracknum, &id3->track_string, size, &buffer_left, &buffer);
-            if (!(tracknum == 0 && (id3->track_string && *id3->track_string)))
-                id3->tracknum = tracknum;
+            read_mp4_tag_i_from_n(fd, &id3->tracknum, &id3->track_string, size, &buffer_left, &buffer);
             break;
         }
 #ifdef HAVE_ALBUMART