diff --git a/src/main/java/codechicken/lib/packet/PacketCustom.java b/src/main/java/codechicken/lib/packet/PacketCustom.java
index 67753d4..52a1455 100644
--- a/src/main/java/codechicken/lib/packet/PacketCustom.java
+++ b/src/main/java/codechicken/lib/packet/PacketCustom.java
@@ -466,7 +466,7 @@ public final class PacketCustom implements MCDataInput, MCDataOutput {
 
     public FluidStack readFluidStack() {
         Fluid fluid = FluidRegistry.getFluid(readShort());
-        if (fluid == null) fluid = FluidRegistry.WATER;
+        if (fluid == null) return null;
 
         return new FluidStack(fluid, readVarInt(), readNBTTagCompound());
     }