diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp index 1a97fc6ffd..1985dba188 100644 --- a/apps/openmw/mwphysics/physicssystem.cpp +++ b/apps/openmw/mwphysics/physicssystem.cpp @@ -1463,7 +1463,10 @@ namespace MWPhysics { if (mWaterCollisionObject.get()) { - mCollisionWorld->removeCollisionObject(mWaterCollisionObject.get()); + if (mWaterCollisionObject.get()->getWorldArrayIndex() >= 0) + { + mCollisionWorld->removeCollisionObject(mWaterCollisionObject.get()); + } } if (!mWaterEnabled)