diff --git a/src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs b/src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs
index bba32ff85..55bcdf820 100644
--- a/src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs
+++ b/src/Infrastructure/BotSharp.Core/Routing/Functions/RouteToAgentFn.cs
@@ -1,7 +1,4 @@
 using BotSharp.Abstraction.Functions;
-using BotSharp.Abstraction.Repositories;
-using BotSharp.Abstraction.Repositories.Filters;
-using BotSharp.Abstraction.Routing;
 using BotSharp.Abstraction.Routing.Models;
 using System.Drawing;
 
diff --git a/src/Infrastructure/BotSharp.Core/Routing/RoutingContext.cs b/src/Infrastructure/BotSharp.Core/Routing/RoutingContext.cs
index d12adfa21..db8900b4f 100644
--- a/src/Infrastructure/BotSharp.Core/Routing/RoutingContext.cs
+++ b/src/Infrastructure/BotSharp.Core/Routing/RoutingContext.cs
@@ -53,6 +53,11 @@ public string OriginAgentId
 
     public string GetCurrentAgentId()
     {
+        if (_stack.Count == 0)
+        {
+            return string.Empty;
+        }
+
         return _stack.Peek();
     }
 
@@ -80,9 +85,10 @@ public void Pop(string? reason = null)
         }
 
         var agentId = _stack.Pop();
+        var currentAgentId = GetCurrentAgentId();
 
         HookEmitter.Emit<IRoutingHook>(_services, async hook =>
-            await hook.OnAgentDequeued(agentId, _stack.Peek(), reason: reason)
+            await hook.OnAgentDequeued(agentId, currentAgentId, reason: reason)
         ).Wait();
     }
 
diff --git a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
index cfc4b446c..812f87e66 100644
--- a/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
+++ b/src/Plugins/BotSharp.Plugin.ChatHub/Hooks/StreamingLogHook.cs
@@ -182,7 +182,7 @@ public async Task OnAgentDequeued(string agentId, string currentAgentId, string?
         var agent = await _agentService.LoadAgent(agentId);
         var currentAgent = await _agentService.LoadAgent(currentAgentId);
 
-        var log = $"{agent.Name} is dequeued{(reason != null ? $" ({reason})" : "")}, current agent is {currentAgent.Name}";
+        var log = $"{agent.Name} is dequeued{(reason != null ? $" ({reason})" : "")}, current agent is {currentAgent?.Name}";
         await _chatHub.Clients.User(_user.Id).SendAsync("OnConversationContentLogGenerated",
             BuildContentLog(conversationId, "Router", log, ContentLogSource.HardRule, new RoleDialogModel(AgentRole.System, log)
             {