diff --git a/CHANGELOG.md b/CHANGELOG.md
index da42274f49..6773984c58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,7 +28,6 @@
     Bug #5207: Loose summons can be present in scene
     Bug #5279: Ingame console stops auto-scrolling after clicking output
     Bug #5318: Aiescort behaves differently from vanilla
-    Bug #5371: 'Dead' slaughterfish added by mod are animated/alive
     Bug #5377: Console does not appear after using menutest in inventory
     Bug #5379: Wandering NPCs falling through cantons
     Bug #5394: Windows snapping no longer works
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index e95ac9b560..ef82d23c9d 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -886,10 +886,12 @@ CharacterController::CharacterController(const MWWorld::Ptr &ptr, MWRender::Anim
     {
         /* Don't accumulate with non-actors. */
         mAnimation->setAccumulation(osg::Vec3f(0.f, 0.f, 0.f));
+
+        mIdleState = CharState_Idle;
     }
 
-    // Update animation status for living actors
-    if (mDeathState == CharState_None && cls.isActor() && !cls.getCreatureStats(mPtr).isDead())
+    // Do not update animation status for dead actors
+    if(mDeathState == CharState_None && (!cls.isActor() || !cls.getCreatureStats(mPtr).isDead()))
         refreshCurrentAnims(mIdleState, mMovementState, mJumpState, true);
 
     mAnimation->runAnimation(0.f);