coder
diff --git a/‎coderd/database/querier.go
-1 b/‎coderd/database/querier.go
-1
diff --git a/‎coderd/database/queries.sql.go
-49 b/‎coderd/database/queries.sql.go
-49
diff --git a/‎coderd/database/queries/groups.sql
-12 b/‎coderd/database/queries/groups.sql
-12
diff --git a/‎enterprise/coderd/templates.go
+5-8 b/‎enterprise/coderd/templates.go
+5-8
diff --git a/‎enterprise/coderd/templates_test.go
+4-3 b/‎enterprise/coderd/templates_test.go
+4-3
@@ -36,18 +36,6 @@ AND
 AND
 	users.deleted = 'false';
 
--- name: GetAllOrganizationMembers :many
-SELECT
-	users.*
-FROM
-	users
-JOIN
-	organization_members
-ON
-	users.id = organization_members.user_id
-WHERE
-	organization_members.organization_id = $1;
-
 -- name: GetGroupsByOrganizationID :many
 SELECT
 	*
 
@@ -78,16 +78,13 @@ func (api *API) templateACL(rw http.ResponseWriter, r *http.Request) {
 	for _, group := range dbGroups {
 		var members []database.User
 
-		if group.Name == database.AllUsersGroup {
-			members, err = api.Database.GetAllOrganizationMembers(ctx, group.OrganizationID)
-		} else {
+		if group.Name != database.AllUsersGroup {
 			members, err = api.Database.GetGroupMembers(ctx, group.ID)
+			if err != nil {
+				httpapi.InternalServerError(rw, err)
+				return
+			}
 		}
-		if err != nil {
-			httpapi.InternalServerError(rw, err)
-			return
-		}
-
 		groups = append(groups, codersdk.TemplateGroup{
 			Group: convertGroup(group.Group, members),
 			Role:  convertToTemplateRole(group.Actions),
 
@@ -76,7 +76,8 @@ func TestTemplateACL(t *testing.T) {
 			},
 		})
 
-		_, user1 := coderdtest.CreateAnotherUserWithUser(t, client, user.OrganizationID)
+		// Create a user to assert they aren't returned in the response.
+		_, _ = coderdtest.CreateAnotherUserWithUser(t, client, user.OrganizationID)
 		version := coderdtest.CreateTemplateVersion(t, client, user.OrganizationID, nil)
 		template := coderdtest.CreateTemplate(t, client, user.OrganizationID, version.ID)
 
@@ -87,8 +88,8 @@ func TestTemplateACL(t *testing.T) {
 		require.NoError(t, err)
 
 		require.Len(t, acl.Groups, 1)
-		require.Len(t, acl.Groups[0].Members, 2)
-		require.Contains(t, acl.Groups[0].Members, user1)
+		// We don't return members for the allUsers group.
+		require.Len(t, acl.Groups[0].Members, 0)
 		require.Len(t, acl.Users, 0)
 	})