diff --git a/apps/openmw/mwrender/animation.cpp b/apps/openmw/mwrender/animation.cpp
index 8bf2160e3b..57a2ac1ec9 100644
--- a/apps/openmw/mwrender/animation.cpp
+++ b/apps/openmw/mwrender/animation.cpp
@@ -144,12 +144,6 @@ void Animation::setObjectRoot(const std::string &model, bool baseonly)
     }
     else
         mAttachedObjects.clear();
-
-    for(size_t i = 0;i < mObjectRoot->mControllers.size();i++)
-    {
-        if(mObjectRoot->mControllers[i].getSource().isNull())
-            mObjectRoot->mControllers[i].setSource(mAnimationTimePtr[0]);
-    }
 }
 
 struct AddGlow
@@ -309,6 +303,12 @@ void Animation::addAnimSource(const std::string &model)
         ctrls[i].setSource(mAnimationTimePtr[grp]);
         grpctrls[grp].push_back(ctrls[i]);
     }
+
+    for (unsigned int i = 0; i < mObjectRoot->mControllers.size(); ++i)
+    {
+        if (mObjectRoot->mControllers[i].getSource().isNull())
+            mObjectRoot->mControllers[i].setSource(mAnimationTimePtr[0]);
+    }
 }
 
 void Animation::clearAnimSources()
@@ -1039,7 +1039,10 @@ Ogre::Vector3 Animation::runAnimation(float duration)
     }
 
     for(size_t i = 0;i < mObjectRoot->mControllers.size();i++)
-        mObjectRoot->mControllers[i].update();
+    {
+        if(!mObjectRoot->mControllers[i].getSource().isNull())
+            mObjectRoot->mControllers[i].update();
+    }
 
     // Apply group controllers
     for(size_t grp = 0;grp < sNumGroups;grp++)