diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index c9c911f4d1..e3d14b0dec 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -234,8 +234,12 @@ private void AddMovieTokens(Dictionary<string, Func<TokenMatch, string>> tokenHa
             tokenHandlers["{Movie Title}"] = m => GetLanguageTitle(movie, m.CustomFormat);
             tokenHandlers["{Movie CleanTitle}"] = m => CleanTitle(GetLanguageTitle(movie, m.CustomFormat));
             tokenHandlers["{Movie Title The}"] = m => TitleThe(movie.Title);
-            tokenHandlers["{Movie Certification}"] = mbox => movie.Certification;
             tokenHandlers["{Movie TitleFirstCharacter}"] = m => TitleThe(movie.Title).Substring(0, 1).FirstCharToUpper();
+
+            if (movie.Certification.IsNotNullOrWhiteSpace())
+            {
+                tokenHandlers["{Movie Certification}"] = mbox => movie.Certification;
+            };
         }
 
         private string GetLanguageTitle(Movie movie, string isoCodes)