diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index b8a623463..8053c9b4e 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -117,6 +117,7 @@ class Coder:
                 done_messages=done_messages,
                 cur_messages=from_coder.cur_messages,
                 aider_commit_hashes=from_coder.aider_commit_hashes,
+                commands=from_coder.commands.clone(),
             )
 
             use_kwargs.update(update)  # override to complete the switch
diff --git a/aider/commands.py b/aider/commands.py
index 6e8b05153..172468838 100644
--- a/aider/commands.py
+++ b/aider/commands.py
@@ -778,7 +778,6 @@ class Commands:
             edit_format="help",
             summarize_from_coder=False,
             map_tokens=512,
-            commands=self.clone(),
             map_mul_no_files=1,
         )
         user_msg = self.help.ask(args)
@@ -817,7 +816,6 @@ class Commands:
             from_coder=self.coder,
             edit_format="ask",
             summarize_from_coder=False,
-            commands=self.clone(),
         )
 
         user_msg = args