diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6911100556..5838e11c77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@
     Bug #4743: PlayGroup doesn't play non-looping animations correctly 
     Bug #4754: Stack of ammunition cannot be equipped partially
     Bug #4816: GetWeaponDrawn returns 1 before weapon is attached
+    Bug #4822: Non-weapon equipment and body parts can't inherit time from parent animation
     Bug #5057: Weapon swing sound plays at same pitch whether it hits or misses
     Bug #5062: Root bone rotations for NPC animation don't work the same as for creature animation
     Bug #5066: Quirks with starting and stopping scripted animations
diff --git a/apps/openmw/mwrender/actoranimation.cpp b/apps/openmw/mwrender/actoranimation.cpp
index fa316fe649..a4541ab5a3 100644
--- a/apps/openmw/mwrender/actoranimation.cpp
+++ b/apps/openmw/mwrender/actoranimation.cpp
@@ -314,6 +314,7 @@ namespace MWRender
         if (node == nullptr)
             return;
 
+        // This is used to avoid playing animations intended for equipped weapons on holstered weapons.
         SceneUtil::ForceControllerSourcesVisitor removeVisitor(std::make_shared<NullAnimationTime>());
         node->accept(removeVisitor);
     }
@@ -345,9 +346,7 @@ namespace MWRender
         if (mesh.empty() || boneName.empty())
             return;
 
-        // 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.
+        // If the scabbard is not found, use the weapon mesh as fallback.
         scabbardName = scabbardName.replace(scabbardName.size() - 4, 4, "_sh.nif");
         bool isEnchanted = !weapon->getClass().getEnchantment(*weapon).empty();
         if (!mResourceSystem->getVFS()->exists(scabbardName))
diff --git a/apps/openmw/mwrender/creatureanimation.cpp b/apps/openmw/mwrender/creatureanimation.cpp
index 7767520715..040ba320a1 100644
--- a/apps/openmw/mwrender/creatureanimation.cpp
+++ b/apps/openmw/mwrender/creatureanimation.cpp
@@ -168,7 +168,7 @@ namespace MWRender
             if (slot == MWWorld::InventoryStore::Slot_CarriedRight)
                 source = mWeaponAnimationTime;
             else
-                source = std::make_shared<NullAnimationTime>();
+                source = mAnimationTimePtr[0];
 
             SceneUtil::AssignControllerSourcesVisitor assignVisitor(source);
             attached->accept(assignVisitor);
diff --git a/apps/openmw/mwrender/npcanimation.cpp b/apps/openmw/mwrender/npcanimation.cpp
index 01bdcec665..900d0d9ae1 100644
--- a/apps/openmw/mwrender/npcanimation.cpp
+++ b/apps/openmw/mwrender/npcanimation.cpp
@@ -842,7 +842,7 @@ namespace MWRender
                 if (type == ESM::PRT_Weapon)
                     src = mWeaponAnimationTime;
                 else
-                    src = std::make_shared<NullAnimationTime>();
+                    src = mAnimationTimePtr[0];
                 SceneUtil::AssignControllerSourcesVisitor assignVisitor(src);
                 node->accept(assignVisitor);
             }