diff --git a/Community/Tdarr_Plugin_00td_action_handbrake_ffmpeg_custom.js b/Community/Tdarr_Plugin_00td_action_handbrake_ffmpeg_custom.js
index 910fdee..ee1baa5 100644
--- a/Community/Tdarr_Plugin_00td_action_handbrake_ffmpeg_custom.js
+++ b/Community/Tdarr_Plugin_00td_action_handbrake_ffmpeg_custom.js
@@ -70,7 +70,7 @@ HandBrake examples:
         type: 'text',
       },
       tooltip:
-        'Enter the desired container',
+        'Enter the desired container. Set to "original" to keep the original container.',
     },
   ],
 });
@@ -91,7 +91,13 @@ const plugin = (file, librarySettings, inputs, otherArguments) => {
   };
 
   response.preset = inputs.arguments;
-  response.container = `.${inputs.container}`;
+
+  if (inputs.container === 'original') {
+    response.container = `.${file.container}`;
+  } else {
+    response.container = `.${inputs.container}`;
+  }
+
   response.handbrakeMode = inputs.cli === 'handbrake';
   response.ffmpegMode = inputs.cli === 'ffmpeg';
   response.reQueueAfter = true;
diff --git a/tests/Community/Tdarr_Plugin_00td_action_handbrake_ffmpeg_custom.js b/tests/Community/Tdarr_Plugin_00td_action_handbrake_ffmpeg_custom.js
index b4105a4..9d4f85e 100644
--- a/tests/Community/Tdarr_Plugin_00td_action_handbrake_ffmpeg_custom.js
+++ b/tests/Community/Tdarr_Plugin_00td_action_handbrake_ffmpeg_custom.js
@@ -61,6 +61,27 @@ const tests = [
       infoLog: 'File is being transcoded using custom arguments \n',
     },
   },
+  {
+    input: {
+      file: require('../sampleData/media/sampleH264_1.json'),
+      librarySettings: {},
+      inputs: {
+        cli: 'ffmpeg',
+        arguments: '<io>-c:v libx265 -crf 23 -ac 6 -c:a aac -preset veryfast',
+        container: 'original',
+      },
+      otherArguments: {},
+    },
+    output: {
+      processFile: true,
+      preset: '<io>-c:v libx265 -crf 23 -ac 6 -c:a aac -preset veryfast',
+      container: '.mp4',
+      handbrakeMode: false,
+      ffmpegMode: true,
+      reQueueAfter: true,
+      infoLog: 'File is being transcoded using custom arguments \n',
+    },
+  },
 ];
 
 void run(tests);