diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 6343e8e79b3..22802a52068 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -859,7 +859,7 @@
     <dependency>
       <groupId>com.google.errorprone</groupId>
       <artifactId>error_prone_annotations</artifactId>
-      <version>${error-prone.version}</version>
+      <version>${error-prone-annotations.version}</version>
       <scope>provided</scope>
     </dependency>
 
diff --git a/src/changelog/.2.x.x/3905_fix_error_prone_dep.xml b/src/changelog/.2.x.x/3905_fix_error_prone_dep.xml
new file mode 100644
index 00000000000..2667e0f4245
--- /dev/null
+++ b/src/changelog/.2.x.x/3905_fix_error_prone_dep.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<entry xmlns="https://logging.apache.org/xml/ns"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+           https://logging.apache.org/xml/ns
+           https://logging.apache.org/xml/ns/log4j-changelog-0.xsd"
+       type="fixed">
+  <issue id="3779" link="https://github.com/apache/logging-log4j2/issues/3779"/>
+  <issue id="3785" link="https://github.com/apache/logging-log4j2/pull/3785"/>
+  <issue id="3905" link="https://github.com/apache/logging-log4j2/pull/3905"/>
+  <description format="asciidoc">
+    Fix the `com.google.errorprone:error_prone_annotations` dependency whose version property gets erased due to flattening
+  </description>
+</entry>