diff --git a/project/PekkoDisciplinePlugin.scala b/project/PekkoDisciplinePlugin.scala
index 7e141d03e4..f6bfc7a449 100644
--- a/project/PekkoDisciplinePlugin.scala
+++ b/project/PekkoDisciplinePlugin.scala
@@ -91,6 +91,11 @@ object PekkoDisciplinePlugin extends AutoPlugin {
     ),
     Compile / doc / scalacOptions := Seq())
 
+  // ignore Scala compile warnings for Java 20+
+  lazy val jvmIgnoreWarnings = {
+    System.getProperty("java.version").startsWith("2")
+  }
+
   /**
    * We are a little less strict in docs
    */
@@ -115,11 +120,10 @@ object PekkoDisciplinePlugin extends AutoPlugin {
         Compile / scalacOptions ++= Seq("-Xfatal-warnings"),
         Test / scalacOptions --= testUndiscipline,
         Compile / javacOptions ++= (
-          if (scalaVersion.value.startsWith("3.")) {
-            Seq()
+          if (jvmIgnoreWarnings || scalaVersion.value.startsWith("3.") || nonFatalJavaWarningsFor(name.value)) {
+            Seq.empty
           } else {
-            if (!nonFatalJavaWarningsFor(name.value)) Seq("-Werror", "-Xlint:deprecation", "-Xlint:unchecked")
-            else Seq.empty
+            Seq("-Werror", "-Xlint:deprecation", "-Xlint:unchecked")
           }
         ),
         Compile / doc / javacOptions := Seq("-Xdoclint:none"),