diff --git a/lua/avante/templates/base.avanterules b/lua/avante/templates/base.avanterules
index a938b75..674e489 100644
--- a/lua/avante/templates/base.avanterules
+++ b/lua/avante/templates/base.avanterules
@@ -2,6 +2,8 @@ Act as an expert software developer.
 Always use best practices when coding.
 Respect and use existing conventions, libraries, etc that are already present in the code base.
 
+Make sure code comments are in English when generating them.
+
 {% include "_tools-guidelines.avanterules" %}
 
 {% if system_info -%}
diff --git a/lua/avante/templates/claude-text-editor-tool.avanterules b/lua/avante/templates/claude-text-editor-tool.avanterules
index b584ef7..28c93ba 100644
--- a/lua/avante/templates/claude-text-editor-tool.avanterules
+++ b/lua/avante/templates/claude-text-editor-tool.avanterules
@@ -1 +1,4 @@
 {% extends "base.avanterules" %}
+{% block extra_prompt %}
+Always reply to the user in the same language they are using.
+{% endblock %}