diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index fa156552aa..72a4ab75cf 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -175,6 +175,8 @@ public string BuildFilePath(Series series, int seasonNumber, string fileName, st
                     seasonFolder = ReplaceTokens(seasonFolder, tokenValues);
                 }
 
+                seasonFolder = CleanFilename(seasonFolder);
+
                 path = Path.Combine(path, seasonFolder);
             }