diff --git a/.changeset/deep-tigers-think.md b/.changeset/deep-tigers-think.md
new file mode 100644
index 000000000..a845151cc
--- /dev/null
+++ b/.changeset/deep-tigers-think.md
@@ -0,0 +1,2 @@
+---
+---
diff --git a/server/internal/customdomains/impl.go b/server/internal/customdomains/impl.go
index 584389c8b..1c65ddfea 100644
--- a/server/internal/customdomains/impl.go
+++ b/server/internal/customdomains/impl.go
@@ -72,7 +72,7 @@ func (s *Service) GetDomain(ctx context.Context, payload *gen.GetDomainPayload)
 		return nil, oops.C(oops.CodeUnauthorized)
 	}
 
-	domain, err := s.repo.GetCustomDomainsByOrganization(ctx, authCtx.ActiveOrganizationID)
+	domain, err := s.repo.GetCustomDomainByOrganization(ctx, authCtx.ActiveOrganizationID)
 	if err != nil {
 		return nil, oops.E(oops.CodeNotFound, err, "no custom domain found for organization").Log(ctx, s.logger)
 	}
diff --git a/server/internal/customdomains/queries.sql b/server/internal/customdomains/queries.sql
index 3dabd0b8a..3c6c278d8 100644
--- a/server/internal/customdomains/queries.sql
+++ b/server/internal/customdomains/queries.sql
@@ -12,7 +12,7 @@ INSERT INTO custom_domains (
 )
 RETURNING *;
 
--- name: GetCustomDomainsByOrganization :one
+-- name: GetCustomDomainByOrganization :one
 SELECT *
 FROM custom_domains
 WHERE organization_id = @organization_id
diff --git a/server/internal/customdomains/repo/queries.sql.go b/server/internal/customdomains/repo/queries.sql.go
index 1dc871459..627cbd0e4 100644
--- a/server/internal/customdomains/repo/queries.sql.go
+++ b/server/internal/customdomains/repo/queries.sql.go
@@ -122,7 +122,7 @@ func (q *Queries) GetCustomDomainByID(ctx context.Context, id uuid.UUID) (Custom
 	return i, err
 }
 
-const getCustomDomainsByOrganization = `-- name: GetCustomDomainsByOrganization :one
+const getCustomDomainByOrganization = `-- name: GetCustomDomainByOrganization :one
 SELECT id, organization_id, domain, verified, activated, ingress_name, cert_secret_name, created_at, updated_at, deleted_at, deleted
 FROM custom_domains
 WHERE organization_id = $1
@@ -130,8 +130,8 @@ WHERE organization_id = $1
 LIMIT 1
 `
 
-func (q *Queries) GetCustomDomainsByOrganization(ctx context.Context, organizationID string) (CustomDomain, error) {
-	row := q.db.QueryRow(ctx, getCustomDomainsByOrganization, organizationID)
+func (q *Queries) GetCustomDomainByOrganization(ctx context.Context, organizationID string) (CustomDomain, error) {
+	row := q.db.QueryRow(ctx, getCustomDomainByOrganization, organizationID)
 	var i CustomDomain
 	err := row.Scan(
 		&i.ID,
diff --git a/server/internal/mcpmetadata/impl.go b/server/internal/mcpmetadata/impl.go
index 7f25dfecf..6eac850d3 100644
--- a/server/internal/mcpmetadata/impl.go
+++ b/server/internal/mcpmetadata/impl.go
@@ -392,7 +392,7 @@ func (s *Service) resolveDomainIDFromContext(ctx context.Context) *uuid.UUID {
 		return nil
 	}
 
-	domainRecord, err := s.domainsRepo.GetCustomDomainsByOrganization(ctx, authCtx.ActiveOrganizationID)
+	domainRecord, err := s.domainsRepo.GetCustomDomainByOrganization(ctx, authCtx.ActiveOrganizationID)
 	if err != nil {
 		s.logger.ErrorContext(ctx, "failed to get custom domains by organization ID", attr.SlogError(err))
 		return nil
diff --git a/server/internal/toolsets/impl.go b/server/internal/toolsets/impl.go
index e45099466..a4bbec5a9 100644
--- a/server/internal/toolsets/impl.go
+++ b/server/internal/toolsets/impl.go
@@ -249,7 +249,7 @@ func (s *Service) UpdateToolset(ctx context.Context, payload *gen.UpdateToolsetP
 
 	var activeCustomDomainID *uuid.UUID
 	toolsetDomainID := conv.FromNullableUUID(existingToolset.CustomDomainID)
-	if domain, err := s.domainsRepo.GetCustomDomainsByOrganization(ctx, authCtx.ActiveOrganizationID); err == nil && domain.Activated && domain.Verified {
+	if domain, err := s.domainsRepo.GetCustomDomainByOrganization(ctx, authCtx.ActiveOrganizationID); err == nil && domain.Activated && domain.Verified {
 		activeCustomDomainID = &domain.ID
 	}