1 files changed, 5 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
index 76541e0ef..ab2f07ecf 100644
--- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
+++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
@@ -18,7 +18,6 @@ namespace MediaBrowser.Controller.Resolvers
         public static List<string> IgnoreFolders = new List<string>()
         {
             "trailers",
-            "metadata",
             "bdmv",
             "certificate",
             "backup",
@@ -61,6 +60,11 @@ namespace MediaBrowser.Controller.Resolvers
                 // Ignore any folders containing a file called .ignore
                 resolve = false;
             }
+            else if (args.FileInfo.cFileName.Equals("metadata", StringComparison.OrdinalIgnoreCase))
+            {
+                // Ignore metadata folders
+                resolve = false;
+            }
 
             return resolve;
         }