diff --git a/src/Infrastructure/BotSharp.Core/Routing/RoutingContext.cs b/src/Infrastructure/BotSharp.Core/Routing/RoutingContext.cs
index 6b126a37..31caa932 100644
--- a/src/Infrastructure/BotSharp.Core/Routing/RoutingContext.cs
+++ b/src/Infrastructure/BotSharp.Core/Routing/RoutingContext.cs
@@ -118,6 +118,7 @@ public class RoutingContext : IRoutingContext
 
         var message = new RoleDialogModel(AgentRole.User, $"Try to route to agent {agent.Name}")
         {
+            CurrentAgentId = currentAgentId,
             FunctionName = "route_to_agent",
             FunctionArgs = JsonSerializer.Serialize(new FunctionCallFromLlm
             {