diff --git a/MediaBrowser.Providers/Manager/ImageSaver.cs b/MediaBrowser.Providers/Manager/ImageSaver.cs
index 7911f35455..b9b07da67d 100644
--- a/MediaBrowser.Providers/Manager/ImageSaver.cs
+++ b/MediaBrowser.Providers/Manager/ImageSaver.cs
@@ -192,6 +192,10 @@ namespace MediaBrowser.Providers.Manager
                     // Remove containing directory if empty
                     var folder = Path.GetDirectoryName(currentPath);
                     FileSystemHelper.DeleteEmptyFolders(_fileSystem, folder, _logger);
+                    if (!_fileSystem.GetFiles(folder).Any())
+                    {
+                        Directory.Delete(folder);
+                    }
                 }
                 catch (FileNotFoundException)
                 {
diff --git a/MediaBrowser.Providers/Manager/ItemImageProvider.cs b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
index c72d4256af..ad80611261 100644
--- a/MediaBrowser.Providers/Manager/ItemImageProvider.cs
+++ b/MediaBrowser.Providers/Manager/ItemImageProvider.cs
@@ -383,6 +383,10 @@ namespace MediaBrowser.Providers.Manager
                         // Always remove empty parent folder
                         var folder = Path.GetDirectoryName(image.Path);
                         FileSystemHelper.DeleteEmptyFolders(_fileSystem, folder, _logger);
+                        if (!_fileSystem.GetFiles(folder).Any())
+                        {
+                            Directory.Delete(folder);
+                        }
                     }
                 }
             }