diff --git a/.upgrade.yml b/.upgrade.yml
index 1cd85c1f9..a14a73482 100644
--- a/.upgrade.yml
+++ b/.upgrade.yml
@@ -1150,6 +1150,8 @@ warnings:
       message: 'Removed'
     'dontEscape()':
       message: 'FormField::dontEscape() has been removed. Escaping is now managed on a class by class basis.'
+    'SilverStripe\Forms\CompositeField::setID()':
+      message: 'ID is generated from name indirectly; Use SilverStripe\Form\FormField::setName() instead'
     'SilverStripe\Forms\FormField::createTag()':
       message: 'moved to SilverStripe\View\HTML->createTag()'
     'SilverStripe\Forms\Form->transformTo()':
@@ -1370,4 +1372,4 @@ warnings:
       url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
     'THIRDPARTY_DIR':
       message: 'Path constants have been deprecated, use the Requirements and ModuleResourceLoader APIs'
-      url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
\ No newline at end of file
+      url: 'https://docs.silverstripe.org/en/4/changelogs/4.0.0#module-paths'
diff --git a/docs/en/04_Changelogs/4.0.0.md b/docs/en/04_Changelogs/4.0.0.md
index 69d53d2a9..b5077747e 100644
--- a/docs/en/04_Changelogs/4.0.0.md
+++ b/docs/en/04_Changelogs/4.0.0.md
@@ -2189,6 +2189,8 @@ appropriate mime types. The following file manipulations classes and methods hav
   submission, in contrast to `FormField::setValue($value, $data)` which is intended to load its
   value from the ORM. The second argument to `setValue()` has been added.
 * `FormField::create_tag()` moved to `SilverStripe\View\HTML->createTag()`.
+* `CompositeField::setID()` is removed. ID is generated from name indirectly.
+  Use SilverStripe\Form\FormField::setName() instead
 * Changed `ListboxField` to multiple only. Previously, this field would operate as either a
   single select (default) or multi-select through `setMultiple()`.
   Now this field should only be used for multi-selection. Single-selection should be done using