diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/RequiresEpisodeTitleFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/RequiresEpisodeTitleFixture.cs
index e4d0b96ba..9906c52f3 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/RequiresEpisodeTitleFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/RequiresEpisodeTitleFixture.cs
@@ -46,6 +46,13 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
             Subject.RequiresEpisodeTitle(_series, new List<Episode> { _episode }).Should().BeFalse();
         }
 
+        [Test]
+        public void should_return_false_if_renaming_episodes_is_off()
+        {
+            _namingConfig.RenameEpisodes = false;
+            Subject.RequiresEpisodeTitle(_series, new List<Episode> { _episode }).Should().BeFalse();
+        }
+
         [Test]
         public void should_return_true_when_episode_title_is_part_of_the_pattern()
         {
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index b17a7f291..3331c8ca0 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -332,6 +332,11 @@ namespace NzbDrone.Core.Organizer
             var namingConfig = _namingConfigService.GetConfig();
             var pattern = namingConfig.StandardEpisodeFormat;
 
+            if (!namingConfig.RenameEpisodes)
+            {
+                return false;
+            }
+
             if (series.SeriesType == SeriesTypes.Daily)
             {
                 pattern = namingConfig.DailyEpisodeFormat;