diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index 32ea474258..683bb0f600 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -375,7 +375,7 @@ namespace MediaBrowser.Providers.Manager
             }
 
             string filename;
-            var folderName = item is MusicAlbum || item is MusicArtist ? "folder" : "poster";
+            var folderName = item is MusicAlbum || item is MusicArtist || (_config.Configuration.ImageSavingConvention == ImageSavingConvention.Legacy && saveLocally) ? "folder" : "poster";
 
             switch (type)
             {