diff --git a/modules/ROOT/pages/clustering/setup/discovery.adoc b/modules/ROOT/pages/clustering/setup/discovery.adoc
index e55f46656..f3e978011 100644
--- a/modules/ROOT/pages/clustering/setup/discovery.adoc
+++ b/modules/ROOT/pages/clustering/setup/discovery.adoc
@@ -34,6 +34,11 @@ The following sections describe the different methods for server discovery, conf
 Depending on the type of xref:configuration/configuration-settings.adoc#config_dbms.cluster.discovery.resolver_type[`dbms.cluster.discovery.resolver_type`] currently in use, the discovery service can use a list of server addresses, DNS records, or Kubernetes services to discover other servers in the cluster.
 The discovery configuration is used for initial discovery and to continuously exchange information about changes to the topology of the cluster.
 
+[NOTE]
+====
+Regardless of the method used to resolve the list of server addresses, ensure that the endpoint for each server hosting the `system` database in primary mode is included.
+====
+
 [[clustering-discovery-list]]
 === Discovery using a list of server addresses
 
diff --git a/modules/ROOT/pages/configuration/configuration-settings.adoc b/modules/ROOT/pages/configuration/configuration-settings.adoc
index b977c0976..391ab5f20 100644
--- a/modules/ROOT/pages/configuration/configuration-settings.adoc
+++ b/modules/ROOT/pages/configuration/configuration-settings.adoc
@@ -365,7 +365,6 @@ m|+++10m+++
 |===
 |Description
 a|A comma-separated list of endpoints that a server should contact in order to discover other cluster members.
-Typically, all cluster members, including the current server, must be specified in this list.
 The setting configures the endpoints for Discovery service V1.
 |Valid values
 a|A comma-separated list where each element is a socket address in the format of `hostname:port`, `hostname`, or `:port`.
@@ -382,7 +381,6 @@ m|
 |===
 |Description
 a|A comma-separated list of endpoints that a server should contact in order to discover other cluster members.
-Typically, all cluster members, including the current server, must be specified in this list.
 The setting configures the endpoints for Discovery service V2.
 |Valid values
 a|A comma-separated list where each element is a socket address in the format of `hostname:port`, `hostname`, or `:port`.
@@ -390,6 +388,12 @@ a|A comma-separated list where each element is a socket address in the format of
 m|
 |===
 
+[NOTE]
+====
+`dbms.cluster.discovery.endpoints` and `dbms.cluster.discovery.v2.endpoints` must contain all cluster members hosting a `system` database in primary mode. 
+However, it is typical that all cluster members, including the current server, are specified in those lists.
+====
+
 [role=label--enterprise-edition label--new-5.22 label--deprecated-5.26]
 [[config_dbms.cluster.discovery.version]]
 === `dbms.cluster.discovery.version`