diff --git a/apps/openmw/mwphysics/movementsolver.cpp b/apps/openmw/mwphysics/movementsolver.cpp
index fd0e090fcb..66530e37ca 100644
--- a/apps/openmw/mwphysics/movementsolver.cpp
+++ b/apps/openmw/mwphysics/movementsolver.cpp
@@ -120,13 +120,6 @@ namespace MWPhysics
     {
         auto* physicActor = actor.mActorRaw;
         const ESM::Position& refpos = actor.mRefpos;
-        // Early-out for totally static creatures
-        // (Not sure if gravity should still apply?)
-        {
-            const auto ptr = physicActor->getPtr();
-            if (!ptr.getClass().isMobile(ptr))
-                return;
-        }
 
         // Reset per-frame data
         physicActor->setWalkingOnWater(false);
@@ -432,10 +425,6 @@ namespace MWPhysics
 
     void MovementSolver::unstuck(ActorFrameData& actor, const btCollisionWorld* collisionWorld)
     {
-        const auto& ptr = actor.mActorRaw->getPtr();
-        if (!ptr.getClass().isMobile(ptr))
-            return;
-
         auto* physicActor = actor.mActorRaw;
         if(!physicActor->getCollisionMode() || actor.mSkipCollisionDetection) // noclipping/tcl
             return;
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 85fb463a95..1028c0062e 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -757,6 +757,8 @@ namespace MWPhysics
         const MWBase::World *world = MWBase::Environment::get().getWorld();
         for (const auto& [ptr, physicActor] : mActors)
         {
+            if (!ptr.getClass().isMobile(physicActor->getPtr()))
+                continue;
             float waterlevel = -std::numeric_limits<float>::max();
             const MWWorld::CellStore *cell = ptr.getCell();
             if(cell->getCell()->hasWater())