diff --git a/src/filescanner.c b/src/filescanner.c
index a641a978..e07ea1cb 100644
--- a/src/filescanner.c
+++ b/src/filescanner.c
@@ -250,10 +250,6 @@ process_media_file(char *file, time_t mtime, off_t size, int compilation)
 	}
     }
 
-  /* These will eventually be overridden by the actual filescanner */
-  mfi.item_kind = 2; /* music */
-  mfi.media_kind = 1; /* music */
-
   /* General case */
   if (ret < 0)
     {
@@ -271,6 +267,11 @@ process_media_file(char *file, time_t mtime, off_t size, int compilation)
 
   mfi.compilation = compilation;
 
+  if (!mfi.item_kind)
+    mfi.item_kind = 2; /* music */
+  if (!mfi.media_kind)
+    mfi.media_kind = 1; /* music */
+
   fixup_tags(&mfi);
 
   if (mfi.id == 0)