diff --git a/MediaBrowser.Api/StartupWizardService.cs b/MediaBrowser.Api/StartupWizardService.cs
index dfb82438e9..40bf4a2ac4 100644
--- a/MediaBrowser.Api/StartupWizardService.cs
+++ b/MediaBrowser.Api/StartupWizardService.cs
@@ -114,7 +114,6 @@ namespace MediaBrowser.Api
         private void SetWizardFinishValues(ServerConfiguration config)
         {
             config.EnableLocalizedGuids = true;
-            config.EnableCustomPathSubFolders = true;
             config.EnableStandaloneMusicKeys = true;
             config.EnableCaseSensitiveItemIds = true;
             //config.EnableFolderView = true;
diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index 2b53c66889..c4f9f206d6 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -49,12 +49,6 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value>The cache path.</value>
         public string CachePath { get; set; }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable custom path sub folders].
-        /// </summary>
-        /// <value><c>true</c> if [enable custom path sub folders]; otherwise, <c>false</c>.</value>
-        public bool EnableCustomPathSubFolders { get; set; }
         
         /// <summary>
         /// Initializes a new instance of the <see cref="BaseApplicationConfiguration" /> class.
diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
index 7db457c6ed..e8669bbc2c 100644
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
@@ -95,13 +95,9 @@ namespace MediaBrowser.Server.Implementations.Configuration
             {
                 metadataPath = GetInternalMetadataPath();
             }
-            else if (Configuration.EnableCustomPathSubFolders)
-            {
-                metadataPath = Path.Combine(Configuration.MetadataPath, "metadata");
-            }
             else
             {
-                metadataPath = Configuration.MetadataPath;
+                metadataPath = Path.Combine(Configuration.MetadataPath, "metadata");
             }
 
             ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = metadataPath;