diff --git a/MediaBrowser.Controller/Entities/BasePluginFolder.cs b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
index fabb69c0f..8f7071000 100644
--- a/MediaBrowser.Controller/Entities/BasePluginFolder.cs
+++ b/MediaBrowser.Controller/Entities/BasePluginFolder.cs
@@ -19,5 +19,10 @@ namespace MediaBrowser.Controller.Entities
                 return LocationType.Virtual;
             }
         }
+
+        protected BasePluginFolder()
+        {
+            DisplayMediaType = "CollectionFolder";
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index faf6d287c..f4d0f9c50 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -571,11 +571,6 @@ namespace MediaBrowser.Server.Implementations.Library
             {
                 var folder = child.GetFolder();
 
-                if (string.IsNullOrEmpty(folder.DisplayMediaType))
-                {
-                    folder.DisplayMediaType = "CollectionFolder";
-                }
-
                 if (folder.Id == Guid.Empty)
                 {
                     folder.Id = (folder.Path ?? folder.Name ?? folder.GetType().Name).GetMBId(folder.GetType());