diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4617936dd..5435835606 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -80,7 +80,6 @@
     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 #4885: Disable in dialogue result script causes a crash
     Bug #4898: Odd/Incorrect lighting on meshes
     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
diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index a22220bcda..77f1ef6d15 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -883,13 +883,12 @@ namespace MWMechanics
         }
 
         mDeathState = hitStateToDeathState(mHitState);
-        if (mDeathState == CharState_None)
-        {
-            if (MWBase::Environment::get().getWorld()->isSwimming(mPtr))
-                mDeathState = CharState_SwimDeath;
-            else if (mAnimation && !mAnimation->hasAnimation(deathStateToAnimGroup(mDeathState)))
-                mDeathState = chooseRandomDeathState();
-        }
+        if (mDeathState == CharState_None && MWBase::Environment::get().getWorld()->isSwimming(mPtr))
+            mDeathState = CharState_SwimDeath;
+
+        if (mDeathState == CharState_None
+            || (mAnimation && !mAnimation->hasAnimation(deathStateToAnimGroup(mDeathState))))
+            mDeathState = chooseRandomDeathState();
 
         // Do not interrupt scripted animation by death
         if (!mAnimation || isScriptedAnimPlaying())
@@ -1160,7 +1159,7 @@ namespace MWMechanics
         else if (action == "shoot release")
         {
             // See notes for melee release above
-            if (mAttackStrength != -1.f  && mAnimation)
+            if (mAttackStrength != -1.f && mAnimation)
             {
                 mAnimation->releaseArrow(mAttackStrength);
                 mReadyToHit = false;