diff --git a/NEWS.txt b/NEWS.txt
index 609aff94e..74567ff1a 100644
--- a/NEWS.txt
+++ b/NEWS.txt
@@ -2,7 +2,9 @@ Version 0.9.0alpha6 - 2007-03-XX
  * Bug Fixes:
    * Artist names from ARs should be translated, too.
    * Freeze after answering no to "download the new version" prompt. (#2542)
-   * %musicbrainz_albumid% not working in file renaming. (#2543)  
+   * %musicbrainz_albumid% not working in file renaming. (#2543)
+   * Track time appears to display incorrectly if it's unknown on
+     MusicBrainz. (#2548)
  * Internals:
    * The browser integration HTTP server rewritten using QTcpServer.
 
diff --git a/picard/mbxml.py b/picard/mbxml.py
index b658addda..d9187f128 100644
--- a/picard/mbxml.py
+++ b/picard/mbxml.py
@@ -106,6 +106,7 @@ def artist_to_metadata(node, m, release=False):
 
 def track_to_metadata(node, m, config=None):
     m['musicbrainz_trackid'] = node.attribs['id']
+    m['~#length'] = 0
     for name, nodes in node.children.iteritems():
         if not nodes:
             continue
@@ -119,8 +120,6 @@ def track_to_metadata(node, m, config=None):
             _relations_to_metadata(nodes, m, config)
         elif name == 'release_list':
             release_to_metadata(nodes[0].release[0], m)
-    if '~#length' not in m:
-        m['~#length'] = 0
     m['~length'] = format_time(m['~#length'])