diff --git a/CHANGELOG.md b/CHANGELOG.md
index c94b586e86..f27d00f8f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,7 @@ a release.
 ### Fixed
 - Removed legacy checks targeting older versions of PHP (#2201)
 - Added missing XSD definitions (#2244)
+- Add conflict against "doctrine/orm" >=2.10 in order to guarantee the schema extension (see https://github.com/doctrine/orm/pull/8852) (#2255)
 
 ## [3.1.0] - 2021-06-22
 ### Fixed
diff --git a/composer.json b/composer.json
index d97ea50d14..7702913f15 100644
--- a/composer.json
+++ b/composer.json
@@ -58,6 +58,7 @@
     "conflict": {
         "doctrine/mongodb": "<1.3",
         "doctrine/mongodb-odm": "<2.0",
+        "doctrine/orm": ">=2.10",
         "sebastian/comparator": "<2.0"
     },
     "suggest": {