diff --git a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
index 81f767e912..12cf86c177 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/TvFolderOrganizer.cs
@@ -62,7 +62,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
                     try
                     {
                         var result = await organizer.OrganizeEpisodeFile(file.FullName, options, options.OverwriteExistingEpisodes, cancellationToken).ConfigureAwait(false);
-                        if (result.Status == FileSortingStatus.Success && !processedFolders.Contains(file.DirectoryName))
+                        if (result.Status == FileSortingStatus.Success && !processedFolders.Contains(file.DirectoryName, StringComparer.OrdinalIgnoreCase))
                         {
                             processedFolders.Add(file.DirectoryName);
                         }
@@ -188,18 +188,7 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
         /// <param name="watchLocations">A list of folders.</param>
         private bool IsWatchFolder(string path, IEnumerable<string> watchLocations)
         {
-            // Use GetFullPath to resolve 8.3 naming and path indirections
-            path = Path.GetFullPath(path);
-
-            foreach (var watchFolder in watchLocations)
-            {
-                if (String.Equals(path, Path.GetFullPath(watchFolder), StringComparison.OrdinalIgnoreCase))
-                {
-                    return true;
-                }
-            }
-
-            return false;
+            return watchLocations.Contains(path, StringComparer.OrdinalIgnoreCase);
         }
     }
 }