diff --git a/agent/chat/service.py b/agent/chat/service.py
index af50ce8..b0d49fb 100644
--- a/agent/chat/service.py
+++ b/agent/chat/service.py
@@ -111,7 +111,7 @@ class ChatService:
         logger.info(f"[ChatService] Starting agent run: session={session_id}, query={query[:80]}")
 
         from config import conf
-        max_context_turns = conf().get("agent_max_context_turns", 30)
+        max_context_turns = conf().get("agent_max_context_turns", 20)
 
         # Get full system prompt with skills
         full_system_prompt = agent.get_full_system_prompt()
diff --git a/agent/protocol/agent.py b/agent/protocol/agent.py
index 3f0167d..3342eea 100644
--- a/agent/protocol/agent.py
+++ b/agent/protocol/agent.py
@@ -480,7 +480,7 @@ class Agent:
 
         # Get max_context_turns from config
         from config import conf
-        max_context_turns = conf().get("agent_max_context_turns", 30)
+        max_context_turns = conf().get("agent_max_context_turns", 20)
         
         # Create stream executor with copied message history
         executor = AgentStreamExecutor(
diff --git a/bridge/agent_initializer.py b/bridge/agent_initializer.py
index f4c8329..44f28b9 100644
--- a/bridge/agent_initializer.py
+++ b/bridge/agent_initializer.py
@@ -146,8 +146,8 @@ class AgentInitializer:
         try:
             from agent.memory import get_conversation_store
             store = get_conversation_store()
-            max_turns = conf().get("agent_max_context_turns", 30)
-            restore_turns = max(6, max_turns // 3)
+            max_turns = conf().get("agent_max_context_turns", 20)
+            restore_turns = max(6, max_turns // 5)
             saved = store.load_messages(session_id, max_turns=restore_turns)
             if saved:
                 filtered = self._filter_text_only_messages(saved)
diff --git a/channel/web/web_channel.py b/channel/web/web_channel.py
index e0ce301..1f4aa07 100644
--- a/channel/web/web_channel.py
+++ b/channel/web/web_channel.py
@@ -524,7 +524,7 @@ class ConfigHandler:
                 "model": local_config.get("model", ""),
                 "channel_type": local_config.get("channel_type", ""),
                 "agent_max_context_tokens": local_config.get("agent_max_context_tokens", 50000),
-                "agent_max_context_turns": local_config.get("agent_max_context_turns", 30),
+                "agent_max_context_turns": local_config.get("agent_max_context_turns", 20),
                 "agent_max_steps": local_config.get("agent_max_steps", 15),
                 "api_bases": api_bases,
                 "api_keys": api_keys_masked,