diff --git a/src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs b/src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs
index 2534c0115..fad63ff7d 100644
--- a/src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs
+++ b/src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs
@@ -29,23 +29,17 @@ public async Task<bool> Execute(RoleDialogModel message)
         {
             // Correct user goal agent to keep orignal task
             var goalAgentInState = states.GetState("user_goal_agent", string.Empty);
-            bool correctToOriginalAgent = false;
-            if (goalAgentInState == string.Empty)
+            if (args.OriginalAgent != goalAgentInState)
             {
                 states.SetState("user_goal_agent", args.OriginalAgent, isNeedVersion: true);
             }
-            else if (args.OriginalAgent != args.AgentName && args.OriginalAgent != goalAgentInState)
-            {
-                // Correct to original agent
-                states.SetState("user_goal_agent", args.OriginalAgent, isNeedVersion: true);
-            }
 
             var db = _services.GetRequiredService<IBotSharpRepository>();
             var filter = new AgentFilter { AgentNames = [args.OriginalAgent] };
             var originalAgent = (await db.GetAgents(filter)).FirstOrDefault();
             if (originalAgent != null)
             {
-                await _context.Push(originalAgent.Id, $"user goal agent{(correctToOriginalAgent ? " " + originalAgent.Name + " & is corrected" : "")}");
+                await _context.Push(originalAgent.Id, "user goal agent");
             }
         }