diff --git a/src/skills/orchestrator/index.js b/src/skills/orchestrator/index.js
index d7d9251..daaf7c8 100644
--- a/src/skills/orchestrator/index.js
+++ b/src/skills/orchestrator/index.js
@@ -33,12 +33,13 @@ function createOrchestratorSkill(skills) {
       return { text: "Invalid event payload" };
     }
     const { query = "", context } = event;
+    const userQuery = typeof query === "string" ? query : safeStringify(query);
     const messages = [];
     if (context) {
       const systemContent = typeof context === "string" ? context : safeStringify(context);
       messages.push({ role: "system", content: systemContent });
     }
-    messages.push({ role: "user", content: query });
+    messages.push({ role: "user", content: userQuery });
 
     const data = await callLLM(messages, tools, event._metadata);
     if (!data?.choices?.length) return { text: "LLM returned no choices" };