diff --git a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
index e36813d11c..ef226a9341 100644
--- a/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
+++ b/MediaBrowser.Server.Implementations/FileOrganization/EpisodeFileOrganizer.cs
@@ -504,7 +504,15 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
         private string GetEpisodeFileName(string sourcePath, string seriesName, int seasonNumber, int episodeNumber, int? endingEpisodeNumber, string episodeTitle, TvFileOrganizationOptions options, int? maxLength)
         {
             seriesName = _fileSystem.GetValidFilename(seriesName).Trim();
-            episodeTitle = _fileSystem.GetValidFilename(episodeTitle).Trim();
+
+            if (episodeTitle == null)
+            {
+                episodeTitle = string.Empty;
+            }
+            else
+            {
+                episodeTitle = _fileSystem.GetValidFilename(episodeTitle).Trim();
+            }
 
             var sourceExtension = (Path.GetExtension(sourcePath) ?? string.Empty).TrimStart('.');