diff --git a/sonar-kotlin-api/build.gradle.kts b/sonar-kotlin-api/build.gradle.kts
index faa83cdc3..5919a254c 100644
--- a/sonar-kotlin-api/build.gradle.kts
+++ b/sonar-kotlin-api/build.gradle.kts
@@ -26,13 +26,3 @@ dependencies {
     testImplementation(testLibs.sonar.plugin.api.test.fixtures)
     testImplementation(project(":sonar-kotlin-test-api"))
 }
-
-// The new version 11.0.17 of javadoc has a bug and does not handle package annotations correctly
-// Adding a "tag" option is a workaround to prevent javadoc errors
-// @see https://bugs.openjdk.org/browse/JDK-8295850
-tasks.withType<Javadoc> {
-    options {
-        this as StandardJavadocDocletOptions
-        addStringOption("tag", "javax.annotation.ParametersAreNonnullByDefault:ParametersAreNonnullByDefault")
-    }
-}
diff --git a/sonar-kotlin-checks/build.gradle.kts b/sonar-kotlin-checks/build.gradle.kts
index 18b2183bb..416290b05 100644
--- a/sonar-kotlin-checks/build.gradle.kts
+++ b/sonar-kotlin-checks/build.gradle.kts
@@ -27,13 +27,3 @@ dependencies {
 
     testImplementation(project(":sonar-kotlin-test-api"))
 }
-
-// The new version 11.0.17 of javadoc has a bug and does not handle package annotations correctly
-// Adding a "tag" option is a workaround to prevent javadoc errors
-// @see https://bugs.openjdk.org/browse/JDK-8295850
-tasks.withType<Javadoc> {
-    options {
-        this as StandardJavadocDocletOptions
-        addStringOption("tag", "javax.annotation.ParametersAreNonnullByDefault:ParametersAreNonnullByDefault")
-    }
-}
diff --git a/sonar-kotlin-external-linters/build.gradle.kts b/sonar-kotlin-external-linters/build.gradle.kts
index dfe00ba3e..ab81f77ec 100644
--- a/sonar-kotlin-external-linters/build.gradle.kts
+++ b/sonar-kotlin-external-linters/build.gradle.kts
@@ -29,14 +29,3 @@ dependencies {
 
     testImplementation(project(":sonar-kotlin-test-api"))
 }
-
-// TODO: check if it has been fixed + backported to JDK 11 (note: has been fixed for JDK 13)
-// The new version 11.0.17 of javadoc has a bug and does not handle package annotations correctly
-// Adding a "tag" option is a workaround to prevent javadoc errors
-// @see https://bugs.openjdk.org/browse/JDK-8295850
-tasks.withType<Javadoc> {
-    options {
-        this as StandardJavadocDocletOptions
-        addStringOption("tag", "javax.annotation.ParametersAreNonnullByDefault:ParametersAreNonnullByDefault")
-    }
-}
diff --git a/sonar-kotlin-gradle/build.gradle.kts b/sonar-kotlin-gradle/build.gradle.kts
index da7c8bdcd..5078c09c4 100644
--- a/sonar-kotlin-gradle/build.gradle.kts
+++ b/sonar-kotlin-gradle/build.gradle.kts
@@ -34,14 +34,3 @@ dependencies {
 
     testImplementation(project(":sonar-kotlin-test-api"))
 }
-
-// TODO: check if it has been fixed + backported to JDK 11 (note: has been fixed for JDK 13)
-// The new version 11.0.17 of javadoc has a bug and does not handle package annotations correctly
-// Adding a "tag" option is a workaround to prevent javadoc errors
-// @see https://bugs.openjdk.org/browse/JDK-8295850
-tasks.withType<Javadoc> {
-    options {
-        this as StandardJavadocDocletOptions
-        addStringOption("tag", "javax.annotation.ParametersAreNonnullByDefault:ParametersAreNonnullByDefault")
-    }
-}
diff --git a/sonar-kotlin-metrics/build.gradle.kts b/sonar-kotlin-metrics/build.gradle.kts
index d6c784a4f..70f994120 100644
--- a/sonar-kotlin-metrics/build.gradle.kts
+++ b/sonar-kotlin-metrics/build.gradle.kts
@@ -33,14 +33,3 @@ dependencies {
     testImplementation(project(":sonar-kotlin-test-api"))
     testImplementation(project(":sonar-kotlin-plugin"))
 }
-
-// TODO: check if it has been fixed + backported to JDK 11 (note: has been fixed for JDK 13)
-// The new version 11.0.17 of javadoc has a bug and does not handle package annotations correctly
-// Adding a "tag" option is a workaround to prevent javadoc errors
-// @see https://bugs.openjdk.org/browse/JDK-8295850
-tasks.withType<Javadoc> {
-    options {
-        this as StandardJavadocDocletOptions
-        addStringOption("tag", "javax.annotation.ParametersAreNonnullByDefault:ParametersAreNonnullByDefault")
-    }
-}
diff --git a/sonar-kotlin-plugin/build.gradle.kts b/sonar-kotlin-plugin/build.gradle.kts
index 14c560f78..f7a53a11d 100644
--- a/sonar-kotlin-plugin/build.gradle.kts
+++ b/sonar-kotlin-plugin/build.gradle.kts
@@ -45,16 +45,6 @@ dependencies {
     testImplementation(project(":sonar-kotlin-test-api"))
 }
 
-// The new version 11.0.17 of javadoc has a bug and does not handle package annotations correctly
-// Adding a "tag" option is a workaround to prevent javadoc errors
-// @see https://bugs.openjdk.org/browse/JDK-8295850
-tasks.withType<Javadoc> {
-    options {
-        this as StandardJavadocDocletOptions
-        addStringOption("tag", "javax.annotation.ParametersAreNonnullByDefault:ParametersAreNonnullByDefault")
-    }
-}
-
 val test: Test by tasks
 test.dependsOn(project(":kotlin-checks-test-sources").tasks.named("build"))
 
diff --git a/sonar-kotlin-surefire/build.gradle.kts b/sonar-kotlin-surefire/build.gradle.kts
index dfe00ba3e..ab81f77ec 100644
--- a/sonar-kotlin-surefire/build.gradle.kts
+++ b/sonar-kotlin-surefire/build.gradle.kts
@@ -29,14 +29,3 @@ dependencies {
 
     testImplementation(project(":sonar-kotlin-test-api"))
 }
-
-// TODO: check if it has been fixed + backported to JDK 11 (note: has been fixed for JDK 13)
-// The new version 11.0.17 of javadoc has a bug and does not handle package annotations correctly
-// Adding a "tag" option is a workaround to prevent javadoc errors
-// @see https://bugs.openjdk.org/browse/JDK-8295850
-tasks.withType<Javadoc> {
-    options {
-        this as StandardJavadocDocletOptions
-        addStringOption("tag", "javax.annotation.ParametersAreNonnullByDefault:ParametersAreNonnullByDefault")
-    }
-}
diff --git a/sonar-kotlin-test-api/build.gradle.kts b/sonar-kotlin-test-api/build.gradle.kts
index 3bdb5d970..9bc18ba86 100644
--- a/sonar-kotlin-test-api/build.gradle.kts
+++ b/sonar-kotlin-test-api/build.gradle.kts
@@ -23,13 +23,3 @@ dependencies {
     implementation(libs.gson)
     implementation(libs.sonar.analyzer.commons.recognizers)
 }
-
-// The new version 11.0.17 of javadoc has a bug and does not handle package annotations correctly
-// Adding a "tag" option is a workaround to prevent javadoc errors
-// @see https://bugs.openjdk.org/browse/JDK-8295850
-tasks.withType<Javadoc> {
-    options {
-        this as StandardJavadocDocletOptions
-        addStringOption("tag", "javax.annotation.ParametersAreNonnullByDefault:ParametersAreNonnullByDefault")
-    }
-}