diff --git a/agent/component/agent_with_tools.py b/agent/component/agent_with_tools.py
index 906a9eca3..bdbdd68e4 100644
--- a/agent/component/agent_with_tools.py
+++ b/agent/component/agent_with_tools.py
@@ -168,7 +168,7 @@ class Agent(LLM, ToolBase):
             output_structure=self._param.outputs['structured']
         except Exception:
             pass
-        if any([self._canvas.get_component_obj(cid).component_name.lower()=="message" for cid in downstreams]) and not output_structure and not (ex and ex["goto"]):
+        if any([self._canvas.get_component_obj(cid).component_name.lower()=="message" for cid in downstreams]) and not (ex and ex["goto"]):
             self.set_output("content", partial(self.stream_output_with_tools, prompt, msg, user_defined_prompt))
             return