diff --git a/queries/admin/teamUser.ts b/queries/admin/teamUser.ts
index 7bc61e34..43d9f476 100644
--- a/queries/admin/teamUser.ts
+++ b/queries/admin/teamUser.ts
@@ -19,13 +19,20 @@ export async function getTeamUser(teamId: string, userId: string): Promise<TeamU
   });
 }
 
-export async function getTeamUsers(teamId: string): Promise<TeamUser[]> {
+export async function getTeamUsers(
+  teamId: string,
+): Promise<(TeamUser & { user: { id: string; username: string } })[]> {
   return prisma.client.teamUser.findMany({
     where: {
       teamId,
     },
     include: {
-      user: true,
+      user: {
+        select: {
+          id: true,
+          username: true,
+        },
+      },
     },
   });
 }
diff --git a/queries/admin/teamWebsite.ts b/queries/admin/teamWebsite.ts
index bff1a9ee..5592a2ac 100644
--- a/queries/admin/teamWebsite.ts
+++ b/queries/admin/teamWebsite.ts
@@ -1,4 +1,4 @@
-import { TeamWebsite, Prisma, Website, Team, User } from '@prisma/client';
+import { TeamWebsite, Prisma, Website, Team, User, TeamUser } from '@prisma/client';
 import { ROLES } from 'lib/constants';
 import { uuid } from 'lib/crypto';
 import prisma from 'lib/prisma';
@@ -38,9 +38,9 @@ export async function getTeamWebsiteByTeamMemberId(
 
 export async function getTeamWebsites(teamId: string): Promise<
   (TeamWebsite & {
-    team: Team;
+    team: Team & { teamUser: TeamUser[] };
     website: Website & {
-      user: User;
+      user: { id: string; username: string };
     };
   })[]
 > {
@@ -60,7 +60,12 @@ export async function getTeamWebsites(teamId: string): Promise<
       },
       website: {
         include: {
-          user: true,
+          user: {
+            select: {
+              id: true,
+              username: true,
+            },
+          },
         },
       },
     },
diff --git a/queries/admin/user.ts b/queries/admin/user.ts
index 0b2d2054..12b7ae3b 100644
--- a/queries/admin/user.ts
+++ b/queries/admin/user.ts
@@ -1,4 +1,4 @@
-import { Prisma, Team } from '@prisma/client';
+import { Prisma, Team, TeamUser } from '@prisma/client';
 import cache from 'lib/cache';
 import { ROLES } from 'lib/constants';
 import prisma from 'lib/prisma';
@@ -40,7 +40,13 @@ export async function getUsers(): Promise<User[]> {
   });
 }
 
-export async function getUserTeams(userId: string): Promise<Team[]> {
+export async function getUserTeams(userId: string): Promise<
+  (Team & {
+    teamUser: (TeamUser & {
+      user: { id: string; username: string };
+    })[];
+  })[]
+> {
   return prisma.client.team.findMany({
     where: {
       teamUser: {
@@ -52,7 +58,12 @@ export async function getUserTeams(userId: string): Promise<Team[]> {
     include: {
       teamUser: {
         include: {
-          user: true,
+          user: {
+            select: {
+              id: true,
+              username: true,
+            },
+          },
         },
       },
     },