diff --git a/Source/Game/Entities/Unit/Unit.Movement.cs b/Source/Game/Entities/Unit/Unit.Movement.cs
index c2af784ad..be6d6d512 100644
--- a/Source/Game/Entities/Unit/Unit.Movement.cs
+++ b/Source/Game/Entities/Unit/Unit.Movement.cs
@@ -1067,7 +1067,7 @@ namespace Game.Entities
                 //! Dying creatures will MoveFall from setDeathState
                 if (hoverHeight != 0 && (!IsDying() || !IsUnit()))
                 {
-                    float newZ = GetPositionZ() - hoverHeight;
+                    float newZ = Math.Max(GetFloorZ(), GetPositionZ() - hoverHeight);
                     UpdateAllowedPositionZ(GetPositionX(), GetPositionY(), ref newZ);
                     UpdateHeight(newZ);
                 }