diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 72a9bbfde..11484ac49 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -1645,6 +1645,8 @@ void CharacterController::playGroup(const std::string &groupname, int mode, int
         }
         else if(mode == 0)
         {
+            if (!mAnimQueue.empty())
+                mAnimation->stopLooping(mAnimQueue.front().first);
             mAnimQueue.resize(1);
             mAnimQueue.push_back(std::make_pair(groupname, count-1));
         }
diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 29db648d0..fc147ce59 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -842,6 +842,17 @@ void Animation::changeGroups(const std::string &groupname, int groups)
         return;
     }
 }
+
+void Animation::stopLooping(const std::string& groupname)
+{
+    AnimStateMap::iterator stateiter = mStates.find(groupname);
+    if(stateiter != mStates.end())
+    {
+        stateiter->second.mLoopCount = 0;
+        return;
+    }
+}
+
 void Animation::play(const std::string &groupname, int priority, int groups, bool autodisable, float speedmult, const std::string &start, const std::string &stop, float startpoint, size_t loops)
 {
     if(!mSkelBase || mAnimSources.empty())
diff --git a/apps/openmw/mwrender/animation.hpp b/apps/openmw/mwrender/animation.hpp
index 8ca3582dc..a8a9ee11e 100644
--- a/apps/openmw/mwrender/animation.hpp
+++ b/apps/openmw/mwrender/animation.hpp
@@ -260,6 +260,10 @@ public:
               float speedmult, const std::string &start, const std::string &stop,
               float startpoint, size_t loops);
 
+    /** If the given animation group is currently playing, set its remaining loop count to '0'.
+     */
+    void stopLooping(const std::string& groupName);
+
     /** Adjust the speed multiplier of an already playing animation.
      */
     void adjustSpeedMult (const std::string& groupname, float speedmult);
diff --git a/apps/openmw/mwscript/animationextensions.cpp b/apps/openmw/mwscript/animationextensions.cpp
index 52de8e042..613cf7d24 100644
--- a/apps/openmw/mwscript/animationextensions.cpp
+++ b/apps/openmw/mwscript/animationextensions.cpp
@@ -55,7 +55,7 @@ namespace MWScript
                             throw std::runtime_error ("animation mode out of range");
                     }
 
-                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, 1);
+                    MWBase::Environment::get().getMechanicsManager()->playAnimationGroup (ptr, group, mode, std::numeric_limits<int>::max());
                }
         };