diff --git a/src/commands/commit.ts b/src/commands/commit.ts
index 143bbab..a2d4550 100644
--- a/src/commands/commit.ts
+++ b/src/commands/commit.ts
@@ -58,6 +58,9 @@ const generateCommitMessageFromGitDiff = async (
       config?.OCO_MESSAGE_TEMPLATE_PLACEHOLDER &&
       typeof messageTemplate === 'string'
     ) {
+      const messageTemplateIndex = extraArgs.indexOf(messageTemplate);
+      extraArgs.splice(messageTemplateIndex, 1);
+
       commitMessage = messageTemplate.replace(
         config?.OCO_MESSAGE_TEMPLATE_PLACEHOLDER,
         commitMessage