diff --git a/apps/openmw/mwmechanics/aicombat.cpp b/apps/openmw/mwmechanics/aicombat.cpp
index 82fc9a67a1..1b0b0e5a89 100644
--- a/apps/openmw/mwmechanics/aicombat.cpp
+++ b/apps/openmw/mwmechanics/aicombat.cpp
@@ -124,6 +124,13 @@ namespace MWMechanics
         if (actor == target) // This should never happen.
             return true;
 
+        // No actions for totally static creatures
+        if (!actor.getClass().isMobile(actor))
+        {
+            storage.mFleeState = AiCombatStorage::FleeState_Idle;
+            return false;
+        }
+
         if (!storage.isFleeing())
         {
             if (storage.mCurrentAction.get()) // need to wait to init action with its attack range
@@ -231,10 +238,6 @@ namespace MWMechanics
                 storage.stopFleeing();
         }
 
-        // No attack actions for totally static creatures
-        if (!actor.getClass().isMobile(actor))
-            return false;
-
         bool isRangedCombat = false;
         float& rangeAttack = storage.mAttackRange;
 
diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 24792b5bbc..4bcfc7dedd 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -135,10 +135,6 @@ bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const osg::Vec3f&
     MWWorld::MovementDirectionFlags supportedMovementDirections, float destTolerance, float endTolerance,
     PathType pathType)
 {
-    // No pathing for totally static creatures
-    if (!actor.getClass().isMobile(actor))
-        return false;
-
     const Misc::TimerStatus timerStatus = mReaction.update(duration);
 
     const osg::Vec3f position = actor.getRefData().getPosition().asVec3(); // position of the actor