diff --git a/docs/rst/notes/forthcoming_version.rst b/docs/rst/notes/forthcoming_version.rst
index 17b4a21f0..52155e768 100644
--- a/docs/rst/notes/forthcoming_version.rst
+++ b/docs/rst/notes/forthcoming_version.rst
@@ -18,6 +18,10 @@ The next release will include the following **Features**:
 * Rename the `max-depth` under the `specs` tag to `history-depth`.
 * Set `app_id` and `app_metadata` attributes in *eProsima DDS Router* participants.
 
+The next release will include the following **Fixes**:
+
+* Make :ref:`Remove Unused Entities <user_manual_configuration_remove_unused_entities>` compatible with :ref:`Built-in Topics <user_manual_configuration_builtin_topics>`.
+
 The next release will include the following **Bugfixes**:
 
 * Save the instance handle data for keyed topics.
diff --git a/docs/rst/user_manual/configuration.rst b/docs/rst/user_manual/configuration.rst
index 70b96fb5b..1ff82e813 100644
--- a/docs/rst/user_manual/configuration.rst
+++ b/docs/rst/user_manual/configuration.rst
@@ -336,6 +336,9 @@ By setting the ``remove-unused-entities`` option to ``true``, the internal entit
 .. warning::
   At the time being, ``remove-unused-entities: true`` is only compatible with a :ref:`discovery-trigger <user_manual_configuration_discovery_trigger>` set to ``reader``.
 
+.. note::
+  The ``remove-unused-entities`` option doesn't apply to :ref:`Built-in Topics <user_manual_configuration_builtin_topics>` since they are created before being discovered by a :term:`Participant`.
+
 .. _user_manual_configuration_discovery_trigger:
 
 Discovery Trigger