diff --git a/mvw-dl.py b/mvw-dl.py
index e70f3d6..ef647dc 100644
--- a/mvw-dl.py
+++ b/mvw-dl.py
@@ -400,8 +400,11 @@ def get_safe_filename(
         shorthand_uuid: str) -> str:
     """https://stackoverflow.com/a/71199182"""
 
+    log.debug(f"{shorthand_uuid} Removing question marks from file name ...")
+    clean_filename = re.sub(r"""[?]""", "", dirty_filename)
+
     log.debug(f"{shorthand_uuid} Replacing unsafe characters in filename with dashes ...")
-    clean_filename = re.sub(r"""[/\\?%*:|"<>\x7F\x00-\x1F]""", "-", dirty_filename)
+    clean_filename = re.sub(r"""[/\\?%*:|"<>\x7F\x00-\x1F]""", "-", clean_filename)
 
     log.debug(f"{shorthand_uuid} New filename: '{clean_filename}'")
     return clean_filename