diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py
index 3aa643e56f4f3774b00d9aa2b2eb1905ace28fef..5c8c065f55e083815897eaab9a61849490fcac75 100644
--- a/api/funkwhale_api/music/metadata.py
+++ b/api/funkwhale_api/music/metadata.py
@@ -67,7 +67,7 @@ VALIDATION = {
 
 CONF = {
     'OggVorbis': {
-        'getter': lambda f, k: f[k][0],
+        'getter': lambda f, k: f[kTr][0],
         'fields': {
             'track_number': {
                 'field': 'TRACKNUMBER',
@@ -132,7 +132,7 @@ CONF = {
         'getter': get_id3_tag,
         'fields': {
             'track_number': {
-                'field': 'TPOS',
+                'field': 'TRCK',
                 'to_application': convert_track_number
             },
             'title': {