diff --git a/src/daemon/dispatcher.py b/src/daemon/dispatcher.py
index c2373ef..1475b56 100644
--- a/src/daemon/dispatcher.py
+++ b/src/daemon/dispatcher.py
@@ -241,7 +241,7 @@ class Dispatcher:
                     new_session=(level == DispatchLevel.ESCALATE),
                     task_id=task.id,
                     on_complete=on_complete,
-                    use_main_session=False,  # Mail 不用 main session，避免和 webchat 竞态
+                    use_main_session=is_mail,
                     task_db_path=Path(project_config["db_path"]) if project_config and "db_path" in project_config else None,
                 )
 
@@ -525,7 +525,7 @@ class Dispatcher:
                     new_session=decision.get("new_session", False),
                     task_id=task.id,
                     on_complete=on_complete_legacy,
-                    use_main_session=False,  # Mail 不用 main session，避免和 webchat 竞态
+                    use_main_session=is_mail_legacy,
                     task_db_path=Path(project_config["db_path"]) if project_config and "db_path" in project_config else None,
                 )
                 return {"level": level.value, "agent_id": agent_id,