1 files changed, 5 insertions, 7 deletions
diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index e5ffd639b..5d326f1ca 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -173,25 +173,23 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
 
             if (!overwriteExisting)
             {
-                if (fileExists || otherDuplicatePaths.Count > 0)
+                if (options.CopyOriginalFile && fileExists && IsSameEpisode(sourcePath, newPath))
                 {
+                    _logger.Info("File {0} already copied to new path {1}, stopping organization", sourcePath, newPath);
                     result.Status = FileSortingStatus.SkippedExisting;
                     result.StatusMessage = string.Empty;
-                    result.DuplicatePaths = otherDuplicatePaths;
                     return;
                 }
-
-                if (options.CopyOriginalFile && fileExists && IsSameEpisode(sourcePath, newPath))
+                
+                if (fileExists || otherDuplicatePaths.Count > 0)
                 {
-                    _logger.Info("File {0} already copied to new path {1}, stopping organization", sourcePath, newPath);
                     result.Status = FileSortingStatus.SkippedExisting;
                     result.StatusMessage = string.Empty;
+                    result.DuplicatePaths = otherDuplicatePaths;
                     return;
                 }
             }
 
-   
-
             PerformFileSorting(options, result);
 
             if (overwriteExisting)