diff --git a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
index 10aa127ed806..f980c7264de0 100644
--- a/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
+++ b/buildSrc/src/main/groovy/org/apache/beam/gradle/BeamModulePlugin.groovy
@@ -1581,8 +1581,6 @@ class BeamModulePlugin implements Plugin<Project> {
             "StringCaseLocaleUsage",
             // DoFn methods are executed reflectively at pipeline runtime
             "UnusedMethod",
-            // Void is a valid element type of DoFn elements
-            "VoidUsed",
           ]
           disabledChecks.each {
             options.errorprone.errorproneArgs.add("-Xep:${it}:OFF")
diff --git a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java
index 8dda27e3a898..5f511a0c7d44 100644
--- a/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java
+++ b/runners/flink/src/test/java/org/apache/beam/runners/flink/translation/wrappers/streaming/FlinkKeyUtilsTest.java
@@ -44,10 +44,9 @@ public void testEncodeDecode() {
 
   @Test
   public void testNullKey() {
-    Void key = null;
     VoidCoder coder = VoidCoder.of();
 
-    ByteBuffer byteBuffer = FlinkKeyUtils.encodeKey(key, coder);
+    ByteBuffer byteBuffer = FlinkKeyUtils.encodeKey(null, coder);
     assertThat(FlinkKeyUtils.decodeKey(byteBuffer, coder), is(nullValue()));
   }