From afb2fc6faf7ec5c4075e8b9ef366eb84560228f4 Mon Sep 17 00:00:00 2001
From: Rowan Smith <rowan@coder.com>
Date: Thu, 26 Mar 2026 06:47:37 +1100
Subject: [PATCH] fix: prevent ui error when last org member is removed
 (#23017)

Backport of #22975 to release/2.29.
---
 coderd/members.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/coderd/members.go b/coderd/members.go
index dd9ce73bba..ba70956646 100644
--- a/coderd/members.go
+++ b/coderd/members.go
@@ -238,9 +238,18 @@ func (api *API) paginatedMembers(rw http.ResponseWriter, r *http.Request) {
 		memberRows = append(memberRows, row)
 	}
 
+	if len(paginatedMemberRows) == 0 {
+		httpapi.Write(ctx, rw, http.StatusOK, codersdk.PaginatedMembersResponse{
+			Members: []codersdk.OrganizationMemberWithUserData{},
+			Count:   0,
+		})
+		return
+	}
+
 	members, err := convertOrganizationMembersWithUserData(ctx, api.Database, memberRows)
 	if err != nil {
 		httpapi.InternalServerError(rw, err)
+		return
 	}
 
 	resp := codersdk.PaginatedMembersResponse{