diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 24d69c7cb4..d7d4c47580 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -655,7 +655,12 @@ private string GetOriginalFileName(MovieFile movieFile, bool multipleTokens)
         {
             if (multipleTokens)
             {
-                return string.Empty;
+                if (movieFile.OriginalFilePath.IsNullOrWhiteSpace())
+                {
+                    return string.Empty;
+                }
+
+                return Path.GetFileNameWithoutExtension(movieFile.OriginalFilePath);
             }
 
             if (movieFile.RelativePath.IsNullOrWhiteSpace())