diff --git a/src/NzbDrone.Core/Organizer/FileNameValidation.cs b/src/NzbDrone.Core/Organizer/FileNameValidation.cs
index d4c667dd9a..1bd7d176b4 100644
--- a/src/NzbDrone.Core/Organizer/FileNameValidation.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameValidation.cs
@@ -34,7 +34,7 @@ public static IRuleBuilderOptions<T, string> ValidMovieFolderFormat<T>(this IRul
 
     public class ValidMovieFormatValidator : PropertyValidator
     {
-        protected override string GetDefaultMessageTemplate() => "Must contain movie title and release year OR Original Title";
+        protected override string GetDefaultMessageTemplate() => "Must contain either movie title and release year OR Original Title/Filename";
 
         protected override bool IsValid(PropertyValidatorContext context)
         {
@@ -43,7 +43,7 @@ protected override bool IsValid(PropertyValidatorContext context)
                 return false;
             }
 
-            return (FileNameBuilder.MovieTitleRegex.IsMatch(value) && FileNameBuilder.ReleaseYearRegex.IsMatch(value)) ||
+            return (FileNameBuilder.MovieTitleRegex.IsMatch(value) && FileNameBuilder.ReleaseYearRegex.IsMatch(value) && !FileNameValidation.OriginalTokenRegex.IsMatch(value)) ||
                    FileNameValidation.OriginalTokenRegex.IsMatch(value);
         }
     }