diff --git a/src/filescanner.c b/src/filescanner.c
index 75cd72c6..35e40ce1 100644
--- a/src/filescanner.c
+++ b/src/filescanner.c
@@ -243,6 +243,10 @@ 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)
     {
@@ -259,7 +263,6 @@ process_media_file(char *file, time_t mtime, off_t size, int compilation)
     }
 
   mfi.compilation = compilation;
-  mfi.item_kind = 2; /* music */
 
   fixup_tags(&mfi);