diff --git a/NickvisionTagger.Shared/Models/MusicFile.cs b/NickvisionTagger.Shared/Models/MusicFile.cs
index bf2444ef..69e0d45a 100644
--- a/NickvisionTagger.Shared/Models/MusicFile.cs
+++ b/NickvisionTagger.Shared/Models/MusicFile.cs
@@ -85,7 +85,7 @@ static MusicFile()
         {
             _invalidSystemFilenameCharacters.Remove('\\');
         }
-        else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+        else
         {
             _invalidSystemFilenameCharacters.Remove('/');
             _invalidWindowsFilenameCharacters.Remove('/');
@@ -887,6 +887,10 @@ public bool TagToFilename(string formatString)
                 {
                     replace = PublishingDate == DateTime.MinValue ? "" : PublishingDate.ToShortDateString();
                 }
+                if(!RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && LimitFilenameCharacters)
+                {
+                    replace = replace.Replace('/', '_');
+                }
                 formatString = formatString.Replace(match.Value, replace);
             }
             else if (customProps.Contains(value))