diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/AgentHookBase.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/AgentHookBase.cs
index f4d30523..a3746ca8 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Agents/AgentHookBase.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Agents/AgentHookBase.cs
@@ -56,9 +56,4 @@ public abstract class AgentHookBase : IAgentHook
     public virtual void OnAgentUtilityLoaded(Agent agent)
     {
     }
-
-    public virtual void OnAgentLoadFilter(Agent agent)
-    {
-
-    }
 }
diff --git a/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentHook.cs b/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentHook.cs
index a329134b..a3f53fb6 100644
--- a/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentHook.cs
+++ b/src/Infrastructure/BotSharp.Abstraction/Agents/IAgentHook.cs
@@ -33,6 +33,4 @@ public interface IAgentHook
     /// <param name="agent"></param>
     /// <returns></returns>
     void OnAgentLoaded(Agent agent);
-
-    void OnAgentLoadFilter(Agent agent);
 }
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs
index 3ae49385..0e9c2e3c 100644
--- a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs
+++ b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.LoadAgent.cs
@@ -7,6 +7,7 @@ public partial class AgentService
 {
     public static ConcurrentDictionary<string, Dictionary<string, string>> AgentParameterTypes = new();
 
+    [MemoryCache(10 * 60, perInstanceCache: true)]
     public async Task<Agent> LoadAgent(string id)
     {
         if (string.IsNullOrEmpty(id) || id == Guid.Empty.ToString())
@@ -14,26 +15,6 @@ public partial class AgentService
             return null;
         }
 
-        Agent agent = await GetLoadAgent(id);
-        OnAgentLoadFilter(agent);
-        return agent;
-    }
-
-    private void OnAgentLoadFilter(Agent? agent)
-    {
-        if (agent != null && agent.Type == AgentType.Routing)
-        {
-            var hooks = _services.GetServices<IAgentHook>();
-            foreach (var hook in hooks)
-            {
-                hook.OnAgentLoadFilter(agent);
-            }
-        }
-    }
-
-    [MemoryCache(10 * 60, perInstanceCache: true)]
-    private async Task<Agent> GetLoadAgent(string id)
-    {
         var hooks = _services.GetServices<IAgentHook>();
 
         // Before agent is loaded.