diff --git a/packages/lib/server/queries/teams/index.ts b/packages/lib/server/queries/teams/index.ts
index cf3e5e3ea6..e3866b4c7c 100644
--- a/packages/lib/server/queries/teams/index.ts
+++ b/packages/lib/server/queries/teams/index.ts
@@ -25,13 +25,13 @@ export async function getTeamWithMembers(args: {
   orgSlug?: string | null;
   includeTeamLogo?: boolean;
   isTeamView?: boolean;
-  currentOrg?: Team | null;
+  currentOrg?: Pick<Team, "id"> | null;
   /**
    * If true, means that you are fetching an organization and not a team
    */
   isOrgView?: boolean;
 }) {
-  const { id, slug, currentOrg, userId, orgSlug, isTeamView, isOrgView, includeTeamLogo } = args;
+  const { id, slug, currentOrg: _currentOrg, userId, orgSlug, isTeamView, isOrgView, includeTeamLogo } = args;
 
   // This should improve performance saving already app data found.
   const appDataMap = new Map();
diff --git a/packages/lib/server/repository/profile.ts b/packages/lib/server/repository/profile.ts
index 59c43e107c..98fe4703d5 100644
--- a/packages/lib/server/repository/profile.ts
+++ b/packages/lib/server/repository/profile.ts
@@ -349,7 +349,15 @@ export class ProfileRepository {
         },
         movedFromUser: true,
         organization: {
-          include: {
+          select: {
+            calVideoLogo: true,
+            id: true,
+            logoUrl: true,
+            name: true,
+            slug: true,
+            metadata: true,
+            bannerUrl: true,
+            isPrivate: true,
             organizationSettings: {
               select: {
                 lockEventTypeCreationForUsers: true,