From 4b8c079eef6c39549caf534feb1e6e1f6bd805bb Mon Sep 17 00:00:00 2001
From: Rowan Smith <rowan@coder.com>
Date: Fri, 13 Mar 2026 08:15:37 +1100
Subject: [PATCH] fix: prevent ui error when last org member is removed
 (#22975)

closes #22974

created with the help of mux
---
 coderd/members.go | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/coderd/members.go b/coderd/members.go
index 6fd1856950..0a7f8985d4 100644
--- a/coderd/members.go
+++ b/coderd/members.go
@@ -287,9 +287,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{