diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs
index 7894eabf..8f962a8c 100644
--- a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs
+++ b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs
@@ -12,7 +12,7 @@ public partial class AgentService
         var query = from a in db.Agent
                     join ua in db.UserAgent on a.Id equals ua.AgentId
                     join u in db.User on ua.UserId equals u.Id
-                    where u.ExternalId == _user.Id
+                    where u.Id == _user.Id || u.ExternalId == _user.Id
                     select a.ToAgent();
         return query.ToList();
     }