diff --git a/packages/features/ee/teams/components/AddNewTeamMembers.tsx b/packages/features/ee/teams/components/AddNewTeamMembers.tsx
index 1acfa756e2..5222b1be74 100644
--- a/packages/features/ee/teams/components/AddNewTeamMembers.tsx
+++ b/packages/features/ee/teams/components/AddNewTeamMembers.tsx
@@ -213,7 +213,10 @@ const PendingMemberItem = (props: { member: TeamMember; index: number; teamId: n
   return (
     <li
       key={member.email}
-      className={classNames("flex items-center justify-between p-6 text-sm", index !== 0 && "border-t")}
+      className={classNames(
+        "flex items-center justify-between p-6 text-sm",
+        index !== 0 && "border-subtle border-t"
+      )}
       data-testid="pending-member-item">
       <div className="flex space-x-2 rtl:space-x-reverse">
         <Avatar
diff --git a/packages/lib/getEventTypeById.ts b/packages/lib/getEventTypeById.ts
index 8de2a28c20..3d2992213a 100644
--- a/packages/lib/getEventTypeById.ts
+++ b/packages/lib/getEventTypeById.ts
@@ -120,6 +120,7 @@ export default async function getEventTypeById({
           members: {
             select: {
               role: true,
+              accepted: true,
               user: {
                 select: {
                   ...userSelect,
@@ -264,8 +265,6 @@ export default async function getEventTypeById({
     giphy: getEventTypeAppData(eventTypeWithParsedMetadata, "giphy", true),
   };
 
-  // TODO: How to extract metadata schema from _EventTypeModel to be able to parse it?
-  // const parsedMetaData = _EventTypeModel.parse(newMetadata);
   const parsedMetaData = newMetadata;
 
   const parsedCustomInputs = (rawEventType.customInputs || []).map((input) => customInputSchema.parse(input));
@@ -363,18 +362,21 @@ export default async function getEventTypeById({
     bookingFields: getBookingFieldsWithSystemFields(eventType),
   });
 
+  const isOrgEventType = !!eventTypeObject.team?.parentId;
   const teamMembers = eventTypeObject.team
-    ? eventTypeObject.team.members.map((member) => {
-        const user: typeof member.user & { avatar: string } = {
-          ...member.user,
-          avatar: `${CAL_URL}/${member.user.username}/avatar.png`,
-        };
-        return {
-          ...user,
-          eventTypes: user.eventTypes.map((evTy) => evTy.slug),
-          membership: member.role,
-        };
-      })
+    ? eventTypeObject.team.members
+        .filter((member) => member.accepted || isOrgEventType)
+        .map((member) => {
+          const user: typeof member.user & { avatar: string } = {
+            ...member.user,
+            avatar: `${CAL_URL}/${member.user.username}/avatar.png`,
+          };
+          return {
+            ...user,
+            eventTypes: user.eventTypes.map((evTy) => evTy.slug),
+            membership: member.role,
+          };
+        })
     : [];
 
   // Find the current users membership so we can check role to enable/disable deletion.
diff --git a/packages/lib/server/queries/teams/index.ts b/packages/lib/server/queries/teams/index.ts
index 6d10bc3ffa..5f8525a467 100644
--- a/packages/lib/server/queries/teams/index.ts
+++ b/packages/lib/server/queries/teams/index.ts
@@ -101,8 +101,6 @@ export async function getTeamWithMembers(args: {
   if (userId) where.members = { some: { userId } };
   if (orgSlug) {
     where.parent = getSlugOrRequestedSlug(orgSlug);
-  } else {
-    where.parentId = null;
   }
   if (id) where.id = id;
   if (slug) where.slug = slug;