From a62cb044f49adadd92a5793d7fa9ed38f85b084f Mon Sep 17 00:00:00 2001
From: Raihan <119592455+raihanbrillmark@users.noreply.github.com>
Date: Fri, 20 Mar 2026 00:51:01 +0600
Subject: [PATCH] fix(organization): filter null organizations in
 listUserInvitations (#8694)

Co-authored-by: Raihan Sharif <raihansharif.info@gmail.com>
---
 packages/better-auth/src/plugins/organization/adapter.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/better-auth/src/plugins/organization/adapter.ts b/packages/better-auth/src/plugins/organization/adapter.ts
index bd676c5dd6..8cd65bf4b9 100644
--- a/packages/better-auth/src/plugins/organization/adapter.ts
+++ b/packages/better-auth/src/plugins/organization/adapter.ts
@@ -930,9 +930,9 @@ export const getOrgAdapter = <O extends OrganizationOptions>(
 					organization: true,
 				},
 			});
-			return invitations.map(({ organization, ...inv }) => ({
+			return invitations.filter(Boolean).map(({ organization, ...inv }) => ({
 				...inv,
-				organizationName: organization.name,
+				organizationName: organization?.name,
 			}));
 		},
 		createInvitation: async ({