diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index afe8f5cd3..68b4c2ac8 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -194,15 +194,16 @@ void ActorAnimation::injectWeaponBones()
     }
 }
 
-// To make sure we do not run morph controllers for weapons, i.e. bows
-class EmptyCallback : public osg::NodeCallback
+void ActorAnimation::resetControllers(osg::Node* node)
 {
-    public:
+    if (node == nullptr)
+        return;
 
-        virtual void operator()(osg::Node* node, osg::NodeVisitor* nv)
-        {
-        }
-};
+    std::shared_ptr<SceneUtil::ControllerSource> src;
+    src.reset(new NullAnimationTime);
+    SceneUtil::AssignControllerSourcesVisitor removeVisitor(src);
+    node->accept(removeVisitor);
+}
 
 void ActorAnimation::updateHolsteredWeapon(bool showHolsteredWeapons)
 {
@@ -230,7 +231,9 @@ void ActorAnimation::updateHolsteredWeapon(bool showHolsteredWeapons)
     if (mesh.empty() || boneName.empty())
         return;
 
-    // If the scabbard is not found, use a weapon mesh as fallback
+    // If the scabbard is not found, use a weapon mesh as fallback.
+    // Note: it is unclear how to handle time for controllers attached to bodyparts, so disable them for now.
+    // We use the similar approach for other bodyparts.
     scabbardName = scabbardName.replace(scabbardName.size()-4, 4, "_sh.nif");
     bool isEnchanted = !weapon->getClass().getEnchantment(*weapon).empty();
     if(!mResourceSystem->getVFS()->exists(scabbardName))
@@ -239,8 +242,7 @@ void ActorAnimation::updateHolsteredWeapon(bool showHolsteredWeapons)
         {
             osg::Vec4f glowColor = getEnchantmentColor(*weapon);
             mScabbard = getWeaponPart(mesh, boneName, isEnchanted, &glowColor);
-            if (mScabbard)
-                mScabbard->getNode()->setUpdateCallback(new EmptyCallback);
+            resetControllers(mScabbard->getNode());
         }
 
         return;
@@ -265,7 +267,7 @@ void ActorAnimation::updateHolsteredWeapon(bool showHolsteredWeapons)
         if (!weaponNode->getNumChildren())
         {
             osg::ref_ptr<osg::Node> fallbackNode = mResourceSystem->getSceneManager()->getInstance(mesh, weaponNode);
-            fallbackNode->setUpdateCallback(new EmptyCallback);
+            resetControllers(fallbackNode);
         }
 
         if (isEnchanted)
diff --git a/apps/openmw/mwrender/actoranimation.hpp b/apps/openmw/mwrender/actoranimation.hpp
index 7a8acd3a8..2146a0260 100644
--- a/apps/openmw/mwrender/actoranimation.hpp
+++ b/apps/openmw/mwrender/actoranimation.hpp
@@ -59,6 +59,7 @@ class ActorAnimation : public Animation, public MWWorld::ContainerStoreListener
     private:
         void addHiddenItemLight(const MWWorld::ConstPtr& item, const ESM::Light* esmLight);
         void removeHiddenItemLight(const MWWorld::ConstPtr& item);
+        void resetControllers(osg::Node* node);
 
         typedef std::map<MWWorld::ConstPtr, osg::ref_ptr<SceneUtil::LightSource> > ItemLightMap;
         ItemLightMap mItemLights;