diff --git a/code/DDSCodeTester.cpp b/code/DDSCodeTester.cpp
index 6a2d39afc..12782a833 100644
--- a/code/DDSCodeTester.cpp
+++ b/code/DDSCodeTester.cpp
@@ -778,13 +778,31 @@ void dds_domain_examples()
     }
 
     {
-        // IGNORE_LOCAL_ENDPOINTS_DOMAINPARTICIPANT
+        // IGNORE_LOCAL_ENDPOINTS
+        // DomainParticipant level: every local endpoint is not matched with
+        // any other local endpoint.
         DomainParticipantQos participant_qos;
 
         // Avoid local matching of this participant's endpoints
         participant_qos.properties().properties().emplace_back(
             "fastdds.ignore_local_endpoints",
             "true");
+
+        // Endpoint level: DataWriter ignores any other local endpoint
+        DataWriterQos datawriter_qos;
+
+        // Avoid local matching with any other local endpoint
+        datawriter_qos.properties().properties().emplace_back(
+            "fastdds.ignore_local_endpoints",
+            "true");
+
+        // Endpoint level: DataReader ignores any other local endpoint
+        DataReaderQos datareader_qos;
+
+        // Avoid local matching with any other local endpoint
+        datareader_qos.properties().properties().emplace_back(
+            "fastdds.ignore_local_endpoints",
+            "true");
         //!--
     }
 }
diff --git a/code/XMLTester.xml b/code/XMLTester.xml
index 6a93fc32b..b045ad8c7 100644
--- a/code/XMLTester.xml
+++ b/code/XMLTester.xml
@@ -2587,7 +2587,7 @@
 </data_writer>
 <!--><-->
 
-<!-->IGNORE_LOCAL_ENDPOINTS_DOMAINPARTICIPANT<-->
+<!-->IGNORE_LOCAL_ENDPOINTS<-->
 <!--
 <?xml version="1.0" encoding="UTF-8" ?>
 <dds xmlns="http://www.eprosima.com/XMLSchemas/fastRTPS_Profiles">
@@ -2606,6 +2606,31 @@
                 </propertiesPolicy>
             </rtps>
         </participant>
+
+        <data_writer profile_name="ignore_local_endpoints_datawriter_xml_profile">
+            <propertiesPolicy>
+                <properties>
+                    <!-- Avoid local matching with any other local DataReader in the participant -->
+                    <property>
+                        <name>fastdds.ignore_local_endpoints</name>
+                        <value>true</value>
+                    </property>
+                </properties>
+            </propertiesPolicy>
+        </data_writer>
+
+        <data_reader profile_name="ignore_local_endpoints_datareader_xml_profile">
+            <propertiesPolicy>
+                <properties>
+                    <!-- Avoid local matching with any other local DataWriter in the participant -->
+                    <property>
+                        <name>fastdds.ignore_local_endpoints</name>
+                        <value>true</value>
+                    </property>
+                </properties>
+            </propertiesPolicy>
+        </data_reader>
+
 <!--
     </profiles>
 </dds>
diff --git a/docs/fastdds/property_policies/ignore_local_endpoints.rst b/docs/fastdds/property_policies/ignore_local_endpoints.rst
index 39d0b1d01..3dd5616ac 100644
--- a/docs/fastdds/property_policies/ignore_local_endpoints.rst
+++ b/docs/fastdds/property_policies/ignore_local_endpoints.rst
@@ -15,7 +15,17 @@ from a |DataWriter| belonging to the same |DomainParticipant| on the |DataReader
 |GuidPrefix_t-api|), this entails for a data sample to go all the way to the |DataReaderListener| just to be discarded
 by an overcomplicated application business logic.
 For this reason, Fast DDS offers the possibility of instructing the |DomainParticipant| to avoid the matching of local
-endpoints through the following property:
+endpoints through the PropertyPolicyQos.
+The property can be configured both at the DomainParticipant level as at the endpoint level:
+
+* When configured in the DomainParticipant, no local endpoint will be matched.
+* When configured in a specific endpoint, that specific endpoint will not be matched with any local one, independently
+  if the other endpoint has or not the property enabled.
+
+.. note::
+
+  If the property is set at both the DomainParticipant and endpoint level, the DomainParticipant configuration takes
+  precedence as it is more restrictive.
 
 .. list-table::
    :header-rows: 1
@@ -34,7 +44,7 @@ endpoints through the following property:
 
         .. literalinclude:: /../code/DDSCodeTester.cpp
             :language: c++
-            :start-after: // IGNORE_LOCAL_ENDPOINTS_DOMAINPARTICIPANT
+            :start-after: // IGNORE_LOCAL_ENDPOINTS
             :end-before: //!--
             :dedent: 8
 
@@ -42,9 +52,9 @@ endpoints through the following property:
 
         .. literalinclude:: /../code/XMLTester.xml
             :language: xml
-            :start-after: <!-->IGNORE_LOCAL_ENDPOINTS_DOMAINPARTICIPANT<-->
+            :start-after: <!-->IGNORE_LOCAL_ENDPOINTS<-->
             :end-before: <!--><-->
-            :lines: 2-4,6-18,20-21
+            :lines: 2-4,6-41,43-44
 
 .. note::
     An invalid value of ``fastdds.ignore_local_endpoints`` results in the default behaviour.