diff --git a/astrbot/core/agent/runners/tool_loop_agent_runner.py b/astrbot/core/agent/runners/tool_loop_agent_runner.py
index c9787ed6f0..75b91cf9ea 100644
--- a/astrbot/core/agent/runners/tool_loop_agent_runner.py
+++ b/astrbot/core/agent/runners/tool_loop_agent_runner.py
@@ -947,6 +947,10 @@ async def step(self):
                     logger.warning(
                         "skills_like tool re-query returned no tool calls; fallback to assistant response."
                     )
+                    # Complete the assistant response (including hooks) BEFORE
+                    # yielding llm_result so response hooks run before the
+                    # result is sent to the user (#9788).
+                    await self._complete_with_assistant_response(llm_resp)
                     if llm_resp.reasoning_content:
                         yield AgentResponse(
                             type="llm_result",
@@ -969,7 +973,6 @@ async def step(self):
                             ),
                         )
 
-                    await self._complete_with_assistant_response(llm_resp)
                     # Re-query uses text_chat(), so its reply has no stream chunks.
                     # Supply them after hooks without changing llm_result ordering.
                     if self.streaming:
diff --git a/astrbot/core/astr_main_agent.py b/astrbot/core/astr_main_agent.py
index 3148d638b6..93a64cbb7a 100644
--- a/astrbot/core/astr_main_agent.py
+++ b/astrbot/core/astr_main_agent.py
@@ -1061,9 +1061,7 @@ async def _decorate_llm_request(
         skip_quote_image_caption=quote_images_already_captioned,
     )
 
-    tz = config.timezone
-    if tz is None:
-        tz = plugin_context.get_config().get("timezone")
+    tz = plugin_context.get_config().get("timezone")
     _append_system_reminders(event, req, cfg, tz)
     await _apply_workspace_extra_prompt(event, req, plugin_context)