diff --git a/packages/better-auth/src/plugins/organization/routes/crud-org.ts b/packages/better-auth/src/plugins/organization/routes/crud-org.ts
index 6acf0cd4a9..6b5777d1f6 100644
--- a/packages/better-auth/src/plugins/organization/routes/crud-org.ts
+++ b/packages/better-auth/src/plugins/organization/routes/crud-org.ts
@@ -228,8 +228,8 @@ export const getFullOrganization = createAuthEndpoint(
 		const session = ctx.context.session;
 		const orgId = ctx.query.orgId || session.session.activeOrganizationId;
 		if (!orgId) {
-			throw new APIError("BAD_REQUEST", {
-				message: "Organization not found",
+			return ctx.json(null, {
+				status: 400,
 			});
 		}
 		const adapter = getOrgAdapter(ctx.context.adapter, ctx.context.orgOptions);