diff --git a/src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingContext.cs b/src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingContext.cs
index 49b38274c..b24c7941b 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingContext.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingContext.cs
@@ -18,8 +18,11 @@ public RoutingContext(RoutingSettings setting)
     /// </summary>
     public string IntentName { get; set; }
 
+    /// <summary>
+    /// Agent that can handl user original goal.
+    /// </summary>
     public string OriginAgentId
-        => _stack.Last();
+        => _stack.Where(x => x != _setting.RouterId).Last();
 
     public string GetCurrentAgentId()
     {