diff --git a/changelog/@unreleased/pr-1621.v2.yml b/changelog/@unreleased/pr-1621.v2.yml
new file mode 100644
index 000000000..a0c06970c
--- /dev/null
+++ b/changelog/@unreleased/pr-1621.v2.yml
@@ -0,0 +1,5 @@
+type: improvement
+improvement:
+  description: Automatically fix the new `ZoneIdOfZ` check
+  links:
+  - https://github.com/palantir/gradle-baseline/pull/1621
diff --git a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java
index 43ae6b360..83c7d5c96 100644
--- a/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java
+++ b/gradle-baseline-java/src/main/groovy/com/palantir/baseline/extensions/BaselineErrorProneExtension.java
@@ -78,7 +78,8 @@ public class BaselineErrorProneExtension {
             "ObjectsHashCodePrimitive",
             "PreferJavaTimeOverload",
             "ProtectedMembersInFinalClass",
-            "UnnecessaryParentheses");
+            "UnnecessaryParentheses",
+            "ZoneIdOfZ");
 
     private final ListProperty<String> patchChecks;