diff --git a/desktop/src/features/channels/ui/ChannelScreen.tsx b/desktop/src/features/channels/ui/ChannelScreen.tsx
index e53909fbe..834fb4e77 100644
--- a/desktop/src/features/channels/ui/ChannelScreen.tsx
+++ b/desktop/src/features/channels/ui/ChannelScreen.tsx
@@ -738,7 +738,7 @@ export function ChannelScreen({
     activeChannel,
     agentConversationMarkers,
     agentLookupReady,
-    agentPubkeys,
+    agentPubkeys: routingAgentPubkeys,
     enabled: isChannelTasksEnabled,
     goChannel,
     messageProfilesReady,
diff --git a/desktop/src/features/channels/ui/useAgentConversationRouteTarget.ts b/desktop/src/features/channels/ui/useAgentConversationRouteTarget.ts
index 42eb0d348..b4e7029d6 100644
--- a/desktop/src/features/channels/ui/useAgentConversationRouteTarget.ts
+++ b/desktop/src/features/channels/ui/useAgentConversationRouteTarget.ts
@@ -98,7 +98,7 @@ export function useAgentConversationRouteTarget({
     if (!sourceMessage) {
       return;
     }
-    if (!marker && !agentLookupReady) {
+    if (!marker?.agentPubkey && !agentLookupReady) {
       return;
     }