diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
index 6ec75457c..5cb9ccfae 100644
--- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
+++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs
@@ -89,6 +89,19 @@ public void Scan(List<string> folders = null, FilterFilesType filter = FilterFil
             {
                 authorIds = new List<int>();
             }
+            else
+            {
+                folders = new List<string>();
+                foreach (var authorId in authorIds)
+                {
+                    var author = _authorService.GetAuthor(authorId);
+
+                    if (author != null)
+                    {
+                        folders.Add(author.Path);
+                    }
+                }
+            }
 
             var mediaFileList = new List<IFileInfo>();