diff --git a/apps/openmw/mwmechanics/aipackage.cpp b/apps/openmw/mwmechanics/aipackage.cpp
index 90fe8c21b..1131b5e6f 100644
--- a/apps/openmw/mwmechanics/aipackage.cpp
+++ b/apps/openmw/mwmechanics/aipackage.cpp
@@ -58,6 +58,18 @@ bool MWMechanics::AiPackage::getRepeat() const
     return false;
 }
 
+void MWMechanics::AiPackage::reset()
+{
+    // reset all members
+    mTimer = AI_REACTION_TIME + 1.0f;
+    mIsShortcutting = false;
+    mShortcutProhibited = false;
+    mShortcutFailPos = ESM::Pathgrid::Point();
+
+    mPathFinder.clearPath();
+    mObstacleCheck.clear();
+}
+
 bool MWMechanics::AiPackage::pathTo(const MWWorld::Ptr& actor, const ESM::Pathgrid::Point& dest, float duration, float destTolerance)
 {
     mTimer += duration; //Update timer
diff --git a/apps/openmw/mwmechanics/aipackage.hpp b/apps/openmw/mwmechanics/aipackage.hpp
index d30ed89ca..4feb13fe0 100644
--- a/apps/openmw/mwmechanics/aipackage.hpp
+++ b/apps/openmw/mwmechanics/aipackage.hpp
@@ -92,6 +92,9 @@ namespace MWMechanics
             /// Return true if this package should repeat. Currently only used for Wander packages.
             virtual bool getRepeat() const;
 
+            /// Reset pathfinding state
+            void reset();
+
             bool isTargetMagicallyHidden(const MWWorld::Ptr& target);
 
         protected:
diff --git a/apps/openmw/mwmechanics/aisequence.cpp b/apps/openmw/mwmechanics/aisequence.cpp
index f05725cc2..b03586c3b 100644
--- a/apps/openmw/mwmechanics/aisequence.cpp
+++ b/apps/openmw/mwmechanics/aisequence.cpp
@@ -234,6 +234,7 @@ void AiSequence::execute (const MWWorld::Ptr& actor, CharacterController& charac
             // Put repeating noncombat AI packages on the end of the stack so they can be used again
             if (isActualAiPackage(packageTypeId) && (mRepeat || package->getRepeat()))
             {
+                package->reset();
                 mPackages.push_back(package->clone());
             }
             // To account for the rare case where AiPackage::execute() queued another AI package