diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/SeriesTitleFirstCharacterFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/SeriesTitleFirstCharacterFixture.cs
index b3ec660a5..a6adbf460 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/SeriesTitleFirstCharacterFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/SeriesTitleFirstCharacterFixture.cs
@@ -36,7 +36,8 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
         [TestCase("The Mist", "M\\The Mist")]
         [TestCase("A", "A\\A")]
         [TestCase("30 Rock", "3\\30 Rock")]
-        [TestCase("The '80s Greatest", "#\\The '80s Greatest")]
+        [TestCase("The '80s Greatest", "_\\The '80s Greatest")]
+        [TestCase("좀비버스", "좀\\좀비버스")]
 
         public void should_get_expected_folder_name_back(string title, string expected)
         {
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 8088a4c3c..4dd0b129f 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -379,15 +379,12 @@ namespace NzbDrone.Core.Organizer
 
         public static string TitleFirstCharacter(string title)
         {
-            title = ScenifyReplaceChars.Replace(title, " ");
-            title = ScenifyRemoveChars.Replace(title, string.Empty);
-
             if (char.IsLetterOrDigit(title[0]))
             {
                 return title.Substring(0, 1).FirstCharToUpper();
             }
 
-            return "#";
+            return "_";
         }
 
         public static string CleanFileName(string name)