diff --git a/pr_agent/settings/configuration.toml b/pr_agent/settings/configuration.toml
index 736e966f..761d6cd5 100644
--- a/pr_agent/settings/configuration.toml
+++ b/pr_agent/settings/configuration.toml
@@ -69,9 +69,7 @@ enable_review_labels_effort=true
 require_all_thresholds_for_incremental_review=false
 minimal_commits_for_incremental_review=0
 minimal_minutes_for_incremental_review=0
-enable_intro_text=true
 enable_help_text=false # Determines whether to include help text in the PR review. Enabled by default.
-enable_chat_text=false
 # auto approval
 enable_auto_approval=false
 maximal_review_effort=5
@@ -114,6 +112,8 @@ commitable_code_suggestions = false
 extra_instructions = ""
 rank_suggestions = false
 enable_help_text=false
+enable_chat_text=true
+enable_intro_text=true
 persistent_comment=true
 max_history_len=4
 # enable to apply suggestion 💎
diff --git a/pr_agent/tools/pr_code_suggestions.py b/pr_agent/tools/pr_code_suggestions.py
index 8c72de54..ff9a9a2f 100644
--- a/pr_agent/tools/pr_code_suggestions.py
+++ b/pr_agent/tools/pr_code_suggestions.py
@@ -615,21 +615,19 @@ class PRCodeSuggestions:
         try:
             pr_body = "## PR Code Suggestions ✨\n\n"
 
-            if get_settings().pr_code_suggestions.enable_intro_text and get_settings().config.is_auto_command:
-                pr_body += "Explore these optional code suggestions:\n\n"
-
             if len(data.get('code_suggestions', [])) == 0:
                 pr_body += "No suggestions found to improve this PR."
                 return pr_body
 
+            if get_settings().pr_code_suggestions.enable_intro_text and get_settings().config.is_auto_command:
+                pr_body += "Explore these optional code suggestions:\n\n"
+
             language_extension_map_org = get_settings().language_extension_map_org
             extension_to_language = {}
             for language, extensions in language_extension_map_org.items():
                 for ext in extensions:
                     extension_to_language[ext] = language
 
-            pr_body = "## PR Code Suggestions ✨\n\n"
-
             pr_body += "<table>"
             header = f"Suggestion"
             delta = 66