diff --git a/UPGRADE.md b/UPGRADE.md
index 4ad23df28f8..91e1df3aa4a 100644
--- a/UPGRADE.md
+++ b/UPGRADE.md
@@ -1,5 +1,9 @@
 # UPGRADE
 
+## FROM 2.16 to 2.17
+
+-   **Live Components**: Change `defer` attribute to `loading="defer"` #1515.
+
 ## FROM 2.15 to 2.16
 
 -   **Live Components**: Change `data-action-name` attribute to `data-live-action-param`
diff --git a/src/LiveComponent/CHANGELOG.md b/src/LiveComponent/CHANGELOG.md
index 58e3ffbf542..dbc96ccc49f 100644
--- a/src/LiveComponent/CHANGELOG.md
+++ b/src/LiveComponent/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 -   Add `modifier` option in `LiveProp` so options can be modified at runtime.
 -   Fix collections hydration with serializer in LiveComponents
+-   Add `loading` attribute to defer the rendering on the component after the
+    page is rendered, either when the page loads (`loading="defer"`) or when 
+    the component becomes visible in the viewport (`loading="lazy"`).
+-   Deprecate the `defer` attribute.
 
 ## 2.16.0