diff --git a/cli.py b/cli.py
index 6c05b6b1e..0389eed5a 100755
--- a/cli.py
+++ b/cli.py
@@ -2157,6 +2157,7 @@ class HermesCLI:
                 result = self.agent.run_conversation(
                     user_message=message,
                     conversation_history=self.conversation_history[:-1],  # Exclude the message we just added
+                    task_id=self.session_id,
                 )
             
             # Start agent in background thread
diff --git a/gateway/run.py b/gateway/run.py
index 617f71ade..fa6ada0fc 100644
--- a/gateway/run.py
+++ b/gateway/run.py
@@ -2131,7 +2131,7 @@ class GatewayRunner:
                             if _p:
                                 _history_media_paths.add(_p)
             
-            result = agent.run_conversation(message, conversation_history=agent_history)
+            result = agent.run_conversation(message, conversation_history=agent_history, task_id=session_id)
             result_holder[0] = result
             
             # Return final response, or a message if something went wrong