diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 3c243773c..bf0a79860 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -21,7 +21,7 @@ from rich.console import Console, Text
 from rich.markdown import Markdown
 
 from aider import __version__, models, prompts, urls, utils
-from aider.commands import Commands
+from aider.commands import Commands, SwitchCoder
 from aider.history import ChatSummary
 from aider.io import InputOutput
 from aider.linter import Linter
@@ -204,7 +204,6 @@ class Coder:
         code_theme="default",
         stream=True,
         use_git=True,
-        voice_language=None,
         cur_messages=None,
         done_messages=None,
         max_chat_history_tokens=None,
@@ -216,6 +215,7 @@ class Coder:
         aider_commit_hashes=None,
         map_mul_no_files=8,
         verify_ssl=True,
+        commands=None,
     ):
         if not fnames:
             fnames = []
@@ -268,7 +268,7 @@ class Coder:
 
         self.show_diffs = show_diffs
 
-        self.commands = Commands(self.io, self, voice_language, verify_ssl=verify_ssl)
+        self.commands = commands or Commands(self.io, self)
 
         self.repo = repo
         if use_git and self.repo is None:
diff --git a/aider/main.py b/aider/main.py
index c926267dc..306a20f20 100644
--- a/aider/main.py
+++ b/aider/main.py
@@ -473,6 +473,8 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
             commit_prompt=args.commit_prompt,
         )
 
+    commands = Commands(io, None, args.voice_language, verify_ssl=args.verify_ssl)
+
     try:
         coder = Coder.create(
             main_model=main_model,
@@ -491,7 +493,6 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
             code_theme=args.code_theme,
             stream=args.stream,
             use_git=args.git,
-            voice_language=args.voice_language,
             max_chat_history_tokens=args.max_chat_history_tokens,
             restore_chat_history=args.restore_chat_history,
             auto_lint=args.auto_lint,
@@ -499,6 +500,7 @@ def main(argv=None, input=None, output=None, force_git_root=None, return_coder=F
             lint_cmds=lint_cmds,
             test_cmd=args.test_cmd,
             verify_ssl=args.verify_ssl,
+            commands=commands,
         )
 
     except ValueError as err: