diff --git a/apps/openmw/mwmechanics/actors.cpp b/apps/openmw/mwmechanics/actors.cpp
index b318e5a503..a60d5ce0f3 100644
--- a/apps/openmw/mwmechanics/actors.cpp
+++ b/apps/openmw/mwmechanics/actors.cpp
@@ -1596,15 +1596,6 @@ namespace MWMechanics
                     world->setActorCollisionMode(actor.getPtr(), false, false);
                     continue;
                 }
-                else if (!isPlayer)
-                {
-                    actor.getPtr().getRefData().getBaseNode()->setNodeMask(MWRender::Mask_Actor);
-                    if (!actor.getPositionAdjusted())
-                    {
-                        actor.getPtr().getClass().adjustPosition(actor.getPtr(), false);
-                        actor.setPositionAdjusted(true);
-                    }
-                }
 
                 const bool isDead = actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDead();
                 if (!isDead && (!godmode || !isPlayer) && actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isParalyzed())
@@ -1612,13 +1603,21 @@ namespace MWMechanics
 
                 // Handle player last, in case a cell transition occurs by casting a teleportation spell
                 // (would invalidate the iterator)
-                if (actor.getPtr() == getPlayer())
+                if (isPlayer)
                 {
                     playerCharacter = &ctrl;
                     continue;
                 }
 
+                actor.getPtr().getRefData().getBaseNode()->setNodeMask(MWRender::Mask_Actor);
                 world->setActorCollisionMode(actor.getPtr(), true, !actor.getPtr().getClass().getCreatureStats(actor.getPtr()).isDeathAnimationFinished());
+
+                if (!actor.getPositionAdjusted())
+                {
+                    actor.getPtr().getClass().adjustPosition(actor.getPtr(), false);
+                    actor.setPositionAdjusted(true);
+                }
+
                 ctrl.update(duration);
 
                 updateVisibility(actor.getPtr(), ctrl);
diff --git a/apps/openmw/mwphysics/actor.hpp b/apps/openmw/mwphysics/actor.hpp
index 01d8037f6b..d19211d49e 100644
--- a/apps/openmw/mwphysics/actor.hpp
+++ b/apps/openmw/mwphysics/actor.hpp
@@ -116,17 +116,11 @@ namespace MWPhysics
 
         void setOnGround(bool grounded);
 
-        bool getOnGround() const
-        {
-            return mInternalCollisionMode && mOnGround;
-        }
+        bool getOnGround() const { return mOnGround; }
 
         void setOnSlope(bool slope);
 
-        bool getOnSlope() const
-        {
-            return mInternalCollisionMode && mOnSlope;
-        }
+        bool getOnSlope() const { return mOnSlope; }
 
         /// Sets whether this actor should be able to collide with the water surface
         void setCanWaterWalk(bool waterWalk);
diff --git a/apps/openmw/mwphysics/physicssystem.cpp b/apps/openmw/mwphysics/physicssystem.cpp
index 1c1a2d6fbd..4de60f4900 100644
--- a/apps/openmw/mwphysics/physicssystem.cpp
+++ b/apps/openmw/mwphysics/physicssystem.cpp
@@ -176,7 +176,7 @@ namespace MWPhysics
     bool PhysicsSystem::isOnSolidGround (const MWWorld::Ptr& actor) const
     {
         const Actor* physactor = getActor(actor);
-        if (!physactor || !physactor->getOnGround())
+        if (!physactor || !physactor->getOnGround() || !physactor->getCollisionMode())
             return false;
 
         const auto obj = physactor->getStandingOnPtr();
@@ -374,7 +374,7 @@ namespace MWPhysics
     bool PhysicsSystem::isOnGround(const MWWorld::Ptr &actor)
     {
         Actor* physactor = getActor(actor);
-        return physactor && physactor->getOnGround();
+        return physactor && physactor->getOnGround() && physactor->getCollisionMode();
     }
 
     bool PhysicsSystem::canMoveToWaterSurface(const MWWorld::ConstPtr &actor, const float waterlevel)