diff --git a/api/funkwhale_api/music/metadata.py b/api/funkwhale_api/music/metadata.py
index 3aa643e56..522c64c85 100644
--- a/api/funkwhale_api/music/metadata.py
+++ b/api/funkwhale_api/music/metadata.py
@@ -132,7 +132,7 @@ CONF = {
         'getter': get_id3_tag,
         'fields': {
             'track_number': {
-                'field': 'TPOS',
+                'field': 'TRCK',
                 'to_application': convert_track_number
             },
             'title': {
diff --git a/api/tests/music/test.mp3 b/api/tests/music/test.mp3
index 35a6e5fce..8502de71b 100644
Binary files a/api/tests/music/test.mp3 and b/api/tests/music/test.mp3 differ
diff --git a/api/tests/music/test_metadata.py b/api/tests/music/test_metadata.py
index bacec07fb..9f9c93984 100644
--- a/api/tests/music/test_metadata.py
+++ b/api/tests/music/test_metadata.py
@@ -43,10 +43,10 @@ def test_can_get_metadata_from_ogg_theora_file(field, value):
 
 @pytest.mark.parametrize('field,value', [
     ('title', 'Bend'),
-    ('artist', 'Binärpilot'),
+    ('artist', 'Bindrpilot'),
     ('album', 'You Can\'t Stop Da Funk'),
     ('date', datetime.date(2006, 2, 7)),
-    ('track_number', 1),
+    ('track_number', 2),
     ('musicbrainz_albumid', uuid.UUID('ce40cdb1-a562-4fd8-a269-9269f98d4124')),
     ('musicbrainz_recordingid', uuid.UUID('f269d497-1cc0-4ae4-a0c4-157ec7d73fcb')),
     ('musicbrainz_artistid', uuid.UUID('9c6bddde-6228-4d9f-ad0d-03f6fcb19e13')),
diff --git a/changes/changelog.d/220.bugfix b/changes/changelog.d/220.bugfix
new file mode 100644
index 000000000..1913df1bd
--- /dev/null
+++ b/changes/changelog.d/220.bugfix
@@ -0,0 +1 @@
+Read ID3Tag Tracknumber from TRCK (#220)