diff --git a/bin/ffx/ffx_controller.py b/bin/ffx/ffx_controller.py
index 5413032..a2b3de8 100644
--- a/bin/ffx/ffx_controller.py
+++ b/bin/ffx/ffx_controller.py
@@ -247,15 +247,15 @@ class FfxController():
                 metadataTokens += [f"-metadata:s:{typeIndicator}:{subIndex}",
                                     f"{tagKey}={tagValue}"]
 
-                if removeMkvmergeMetadata:
-
-                    #TODO: #401
-                    for ignKey in FfxController.IGNORED_METADATA_KEYS:
-                        metadataTokens += [f"-metadata:g",
-                                            f"{ignKey}="]
-                    for mmKey in FfxController.MKVMERGE_METADATA_KEYS:
-                        metadataTokens += [f"-metadata:s:{typeIndicator}:{subIndex}",
-                                            f"{mmKey}="]
+            if removeMkvmergeMetadata:
+
+                #TODO: #401
+                for ignKey in FfxController.IGNORED_METADATA_KEYS:
+                    metadataTokens += [f"-metadata:g",
+                                        f"{ignKey}="]
+                for mmKey in FfxController.MKVMERGE_METADATA_KEYS:
+                    metadataTokens += [f"-metadata:s:{typeIndicator}:{subIndex}",
+                                        f"{mmKey}="]
 
 
         return metadataTokens