diff --git a/src/main/java/me/jellysquid/mods/lithium/mixin/entity/collisions/fluid/EntityMixin.java b/src/main/java/me/jellysquid/mods/lithium/mixin/entity/collisions/fluid/EntityMixin.java
index 75f09e540..f3f6b9828 100644
--- a/src/main/java/me/jellysquid/mods/lithium/mixin/entity/collisions/fluid/EntityMixin.java
+++ b/src/main/java/me/jellysquid/mods/lithium/mixin/entity/collisions/fluid/EntityMixin.java
@@ -127,15 +127,7 @@ protected boolean updateWaterState() {
         this.radium$isInModdedFluid = false;
         this.checkWaterState();
 
-        if (this.radium$isInModdedFluid) {
-            this.handleModdedFluidBehaviors();
-        }
-
-        return this.isInFluidType();
-    }
-
-    private void handleModdedFluidBehaviors() {
-        if (!(this.getVehicle() instanceof BoatEntity)) {
+        if (this.radium$isInModdedFluid && !(this.getVehicle() instanceof BoatEntity)) {
             float fallDistanceModifier = Float.MAX_VALUE;
             boolean canExtinguish = false;
 
@@ -154,6 +146,8 @@ private void handleModdedFluidBehaviors() {
                 this.extinguish();
             }
         }
+
+        return this.isInFluidType();
     }
 
     /**