diff --git a/api/core/workflow/nodes/agent_v2/node.py b/api/core/workflow/nodes/agent_v2/node.py
index 6b9a373aa8..af214d44e1 100644
--- a/api/core/workflow/nodes/agent_v2/node.py
+++ b/api/core/workflow/nodes/agent_v2/node.py
@@ -170,10 +170,6 @@ class AgentV2Node(Node[AgentV2NodeData]):
                 chunk_text = self._extract_chunk_text(chunk)
                 if chunk_text:
                     full_text += chunk_text
-                    yield StreamChunkEvent(
-                        selector=[self._node_id, "text"],
-                        chunk=chunk_text,
-                    )
 
                 if chunk.delta.usage:
                     usage = chunk.delta.usage
diff --git a/api/services/app_generate_service.py b/api/services/app_generate_service.py
index 06fc51bddc..520cb4f9cf 100644
--- a/api/services/app_generate_service.py
+++ b/api/services/app_generate_service.py
@@ -141,6 +141,12 @@ class AppGenerateService:
                         workflow.id,
                     )
 
+                    upgraded_args = dict(args)
+                    if "query" not in upgraded_args or not upgraded_args.get("query"):
+                        inputs = upgraded_args.get("inputs", {})
+                        upgraded_args["query"] = inputs.get("query", "") or inputs.get("input", "") or str(inputs)
+                    args = upgraded_args
+
                     if streaming:
                         with rate_limit_context(rate_limit, request_id):
                             payload = AppExecutionParams.new(