diff --git a/src/p_map.c b/src/p_map.c
index 431d53457..9ec73d3f6 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -1006,7 +1006,7 @@ bool P_IsInLiquid(mobj_t *thing)
     }
 
     return (highestsector->terraintype >= LIQUID && !highestsector->isselfreferencing
-        && !(thing->flags & MF_NOGRAVITY));
+        && (thing->player || thing->z == highestsector->floorheight));
 }
 
 //