diff --git a/src/filescanner.c b/src/filescanner.c
index b24eb3a9..1999121c 100644
--- a/src/filescanner.c
+++ b/src/filescanner.c
@@ -381,10 +381,10 @@ process_media_file(char *file, time_t mtime, off_t size, int compilation)
   if (!mfi.media_kind)
     mfi.media_kind = 1; /* music */
 
-  fixup_tags(&mfi);
-
   unicode_fixup_mfi(&mfi);
 
+  fixup_tags(&mfi);
+
   if (mfi.id == 0)
     db_file_add(&mfi);
   else