diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
index 984000996..0b96799ca 100644
--- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
@@ -94,9 +94,17 @@ namespace NzbDrone.Core.MediaFiles
             {
                 if (_configService.CreateEmptySeriesFolders)
                 {
-                    _logger.Debug("Creating missing series folder: {0}", series.Path);
-                    _diskProvider.CreateFolder(series.Path);
-                    SetPermissions(series.Path);
+                    if (_configService.DeleteEmptyFolders)
+                    {
+                        _logger.Debug("Not creating missing series folder: {0} because delete empty series folders is enabled", series.Path);
+                    }
+                    else
+                    {
+                        _logger.Debug("Creating missing series folder: {0}", series.Path);
+                        
+                        _diskProvider.CreateFolder(series.Path);
+                        SetPermissions(series.Path);
+                    }
                 }
                 else
                 {