diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
index bb2e47e7f..0d760c4ce 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/FileNameBuilderFixture.cs
@@ -303,6 +303,17 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
             Subject.BuildTrackFileName(new List<Track> { _track1 }, _artist, _album, _trackFile)
                    .Should().Be(Path.GetFileNameWithoutExtension(_trackFile.RelativePath));
         }
+        
+        [Test]
+        public void use_file_name_when_sceneName_is_not_null()
+        {
+            _namingConfig.RenameTracks = false;
+            _trackFile.RelativePath = "Linkin Park - 06 - Test";
+            _trackFile.SceneName = "SceneName";
+
+            Subject.BuildTrackFileName(new List<Track> { _track1 }, _artist, _album, _trackFile)
+                   .Should().Be(Path.GetFileNameWithoutExtension(_trackFile.RelativePath));
+        }
 
         [Test]
         public void use_path_when_sceneName_and_relative_path_are_null()
@@ -315,7 +326,6 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
                    .Should().Be(Path.GetFileNameWithoutExtension(_trackFile.Path));
         }
 
-
         [Test]
         public void should_not_clean_track_title_if_there_is_only_one()
         {
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 275d6b237..af5d4f748 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -93,7 +93,7 @@ namespace NzbDrone.Core.Organizer
 
             if (!namingConfig.RenameTracks)
             {
-                return GetOriginalTitle(trackFile);
+                return GetOriginalFileName(trackFile);
             }
 
             if (namingConfig.StandardTrackFormat.IsNullOrWhiteSpace())