diff --git a/addOns/addOns.gradle.kts b/addOns/addOns.gradle.kts
index 3415386d894..8688ad2bfa0 100644
--- a/addOns/addOns.gradle.kts
+++ b/addOns/addOns.gradle.kts
@@ -130,6 +130,12 @@ subprojects {
         }
     }
 
+    tasks.withType<JavaCompile>().configureEach {
+        if (JavaVersion.current().getMajorVersion() >= "21") {
+            options.compilerArgs = options.compilerArgs + "-Xlint:-this-escape"
+        }
+    }
+
     tasks.named<JacocoReport>("jacocoTestReport") {
         reports {
             xml.required.set(true)
diff --git a/build.gradle.kts b/build.gradle.kts
index 65567fa73fc..6432ea95eb8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -54,6 +54,9 @@ allprojects {
     }
 
     tasks.withType<JavaCompile>().configureEach {
+        if (JavaVersion.current().getMajorVersion() >= "21") {
+            options.compilerArgs = options.compilerArgs + "-Xlint:-this-escape"
+        }
         options.errorprone {
             disableAllChecks.set(true)
             error(
diff --git a/buildSrc/src/main/java/org/zaproxy/gradle/tasks/ProcessSvnDiggerFiles.java b/buildSrc/src/main/java/org/zaproxy/gradle/tasks/ProcessSvnDiggerFiles.java
index 79856e2a53d..05ec13113ee 100644
--- a/buildSrc/src/main/java/org/zaproxy/gradle/tasks/ProcessSvnDiggerFiles.java
+++ b/buildSrc/src/main/java/org/zaproxy/gradle/tasks/ProcessSvnDiggerFiles.java
@@ -45,6 +45,7 @@ public class ProcessSvnDiggerFiles extends DefaultTask {
     private final ConfigurableFileTree sourceFiles;
     private final DirectoryProperty outputDir;
 
+    @SuppressWarnings("this-escape")
     public ProcessSvnDiggerFiles() {
         this.sourceFiles = getProject().fileTree(getProject().file("src/main/" + SVNDIGGER_DIR));
         this.sourceFiles.exclude(LICENCE_FILE_NAME, README_FILE_NAME);