diff --git a/unshackle/core/titles/episode.py b/unshackle/core/titles/episode.py
index b260ce9..1b34228 100644
--- a/unshackle/core/titles/episode.py
+++ b/unshackle/core/titles/episode.py
@@ -114,7 +114,7 @@ class Episode(Title):
                 year=f" {self.year}" if self.year and config.series_year else "",
                 season=self.season,
                 number=self.number,
-                name=self.name or "",
+                name=self.name if self.name and config.insert_episodename_into_filenames else "",
             ).strip()
 
         if config.scene_naming: