diff --git a/gradle/errorprone.gradle b/gradle/errorprone.gradle
index 5f25920d2..1c9b3874d 100644
--- a/gradle/errorprone.gradle
+++ b/gradle/errorprone.gradle
@@ -10,8 +10,5 @@ tasks.withType(JavaCompile).configureEach {
         error("NullAway")
 
         option("NullAway:AnnotatedPackages", "com.velocitypowered")
-        option("NullAway:ExcludedClasses",
-                "com.velocitypowered.proxy.network.packet.clientbound.ClientboundJoinGamePacket," +
-                "com.velocitypowered.proxy.network.packet.clientbound.ClientboundRespawnPacket")
     }
 }
\ No newline at end of file
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/network/packet/clientbound/ClientboundJoinGamePacket.java b/proxy/src/main/java/com/velocitypowered/proxy/network/packet/clientbound/ClientboundJoinGamePacket.java
index e027a851e..022ba5607 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/network/packet/clientbound/ClientboundJoinGamePacket.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/network/packet/clientbound/ClientboundJoinGamePacket.java
@@ -36,7 +36,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
 // TODO: This class is in dire need of a refactor. Suppressing the warning is only done as an
 //       implicit acknowledgement that this code is very bad.
-@SuppressWarnings("WarnAway")
+@SuppressWarnings("NullAway")
 public class ClientboundJoinGamePacket implements Packet {
   public static final PacketReader<ClientboundJoinGamePacket> DECODER = PacketReader.method(ClientboundJoinGamePacket::new);
   public static final PacketWriter<ClientboundJoinGamePacket> ENCODER = PacketWriter.deprecatedEncode();
diff --git a/proxy/src/main/java/com/velocitypowered/proxy/network/packet/clientbound/ClientboundRespawnPacket.java b/proxy/src/main/java/com/velocitypowered/proxy/network/packet/clientbound/ClientboundRespawnPacket.java
index c66b1e096..4eddab4b4 100644
--- a/proxy/src/main/java/com/velocitypowered/proxy/network/packet/clientbound/ClientboundRespawnPacket.java
+++ b/proxy/src/main/java/com/velocitypowered/proxy/network/packet/clientbound/ClientboundRespawnPacket.java
@@ -33,7 +33,7 @@ import org.checkerframework.checker.nullness.qual.Nullable;
 
 // TODO: This class is in dire need of a refactor. Suppressing the warning is only done as an
 //       implicit acknowledgement that this code is very bad.
-@SuppressWarnings("WarnAway")
+@SuppressWarnings("NullAway")
 public class ClientboundRespawnPacket implements Packet {
   public static final PacketReader<ClientboundRespawnPacket> DECODER = PacketReader.method(ClientboundRespawnPacket::new);
   public static final PacketWriter<ClientboundRespawnPacket> ENCODER = PacketWriter.deprecatedEncode();