diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/TimestampCombiner.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/TimestampCombiner.java
index b5cedebf86aa..e743388a56ea 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/TimestampCombiner.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/windowing/TimestampCombiner.java
@@ -33,7 +33,6 @@
  * <p>In particular, these govern the timestamp on the output of a grouping transform such as {@link
  * GroupByKey} or {@link Combine}.
  */
-@SuppressWarnings({"nullness", "keyfor"}) // TODO(https://github.com/apache/beam/issues/20497)
 public enum TimestampCombiner {
   /**
    * The policy of taking at the earliest of a set of timestamps.