diff --git a/docs/source/upgrade-guide/index.md b/docs/source/upgrade-guide/index.md
index bd0b128418..940f549c2b 100644
--- a/docs/source/upgrade-guide/index.md
+++ b/docs/source/upgrade-guide/index.md
@@ -503,6 +503,12 @@ razzle.config.js
 
 The change involves adding a new `paths` argument to the `customModifyWebpackConfig` function.
 
+### Added rule for ESlint to detect missing key property in iterators.
+
+The `react/jsx-key` rule has been enabled in ESlint for catching missing `key` in JSX iterators.
+Might be that you catch up some violations in your project or add-on code after running ESlint.
+Adding the missing `key` property whenever the violation is reported will fix it.
+
 (volto-upgrade-guide-17.x.x)=
 
 ## Upgrading to Volto 17.x.x
diff --git a/packages/volto/news/6387.breaking b/packages/volto/news/6387.breaking
new file mode 100644
index 0000000000..af52e7b23f
--- /dev/null
+++ b/packages/volto/news/6387.breaking
@@ -0,0 +1 @@
+Added `react/jsx-key` rule for ESlint to detect missing key property in iterators. @sneridagh