diff --git a/python_apps/media-monitor2/media/metadata/definitions.py b/python_apps/media-monitor2/media/metadata/definitions.py
index c53d091f3..0e7282b20 100644
--- a/python_apps/media-monitor2/media/metadata/definitions.py
+++ b/python_apps/media-monitor2/media/metadata/definitions.py
@@ -124,16 +124,12 @@ def load_definitions():
             default_title = re.sub(r'__\d+\.',u'.', default_title)
 
             # format is: track_number-title-123kbps.mp3
-            m = re.match(".+-(?P<title>.+)-\d+kbps", default_title)
+            m = re.match(".+-(?P<title>.+)-\d+kbps$", default_title)
             if m:
                 if m.group('title') == unicode_unknown: new_title = ''
                 else: new_title = m.group('title')
+            else: new_title = re.sub(r'-\d+kbps$', u'', new_title)
 
-            if re.match(".+-%s-.+$" % unicode_unknown, default_title):
-                default_title = u''
-
-            new_title = default_title
-            new_title = re.sub(r'-\d+kbps$', u'', new_title)
         return new_title
 
     with md.metadata('MDATA_KEY_TITLE') as t: