diff --git a/server/bot/list.py b/server/bot/list.py
index 040582a8..f4cf368e 100644
--- a/server/bot/list.py
+++ b/server/bot/list.py
@@ -2,15 +2,16 @@
 
 from github import Github, Auth
 from core.dao.repositoryConfigDAO import RepositoryConfigDAO
+from core.models.user import User
 from petercat_utils import get_client
 
 
 def query_list(
     name: Optional[str] = None,
-    user_id: Optional[str] = None,
-    access_token: Optional[str] = None,
+    user: Optional[User] = None,
     personal: Optional[str] = None,
 ):
+
     try:
         supabase = get_client()
         query = (
@@ -24,9 +25,10 @@ def query_list(
             query = query.filter("name", "like", f"%{name}%")
 
         if personal == "true":
-            if not access_token or not user_id:
-                return {"data": [], "personal": personal}
-
+            if not user:
+                return None
+            user_id = user.id
+            access_token = user.access_token
             auth = Auth.Token(token=access_token)
             github_user = Github(auth=auth).get_user()
             orgs_ids = [org.id for org in github_user.get_orgs()]
diff --git a/server/bot/router.py b/server/bot/router.py
index 8eb0e6ee..c70440e6 100644
--- a/server/bot/router.py
+++ b/server/bot/router.py
@@ -32,8 +32,9 @@ def get_bot_list(
     name: Optional[str] = Query(None, description="Filter bots by name"),
     user: Annotated[User | None, Depends(get_user)] = None,
 ):
+
     try:
-        data = query_list(name, user.id, user.access_token, personal)
+        data = query_list(name, user, personal)
 
         return {"data": data if data else [], "personal": personal}