diff --git a/src/trpc/router.ts b/src/trpc/router.ts
index 699cfd0..3edf19c 100644
--- a/src/trpc/router.ts
+++ b/src/trpc/router.ts
@@ -408,8 +408,8 @@ export const appRouter = router({
    */
   listAgents: publicProcedure
     .query(async ({ ctx }) => {
-      const agentManager = requireAgentManager(ctx);
-      return agentManager.list();
+      if (!ctx.agentManager) return [];
+      return ctx.agentManager.list();
     }),
 
   /**
@@ -463,9 +463,9 @@ export const appRouter = router({
   getAgentQuestions: publicProcedure
     .input(agentIdentifierSchema)
     .query(async ({ ctx, input }): Promise<PendingQuestions | null> => {
-      const agentManager = requireAgentManager(ctx);
+      if (!ctx.agentManager) return null;
       const agent = await resolveAgent(ctx, input);
-      return agentManager.getPendingQuestions(agent.id);
+      return ctx.agentManager.getPendingQuestions(agent.id);
     }),
 
   /**
@@ -474,8 +474,8 @@ export const appRouter = router({
    */
   listWaitingAgents: publicProcedure
     .query(async ({ ctx }) => {
-      const agentManager = requireAgentManager(ctx);
-      const allAgents = await agentManager.list();
+      if (!ctx.agentManager) return [];
+      const allAgents = await ctx.agentManager.list();
       return allAgents.filter(agent => agent.status === 'waiting_for_input');
     }),