diff --git a/apps/openmw/mwmechanics/character.cpp b/apps/openmw/mwmechanics/character.cpp
index 6f0a255a9..ddfba51ce 100644
--- a/apps/openmw/mwmechanics/character.cpp
+++ b/apps/openmw/mwmechanics/character.cpp
@@ -409,13 +409,6 @@ MWWorld::ContainerStoreIterator getActiveWeapon(CreatureStats &stats, MWWorld::I
 
 void CharacterController::playDeath(float startpoint, CharacterState death)
 {
-    if (mPtr == MWBase::Environment::get().getWorld()->getPlayerPtr())
-    {
-        // The first-person animations do not include death, so we need to
-        // force-switch to third person before playing the death animation.
-        MWBase::Environment::get().getWorld()->useDeathCamera();
-    }
-
     switch (death)
     {
     case CharState_SwimDeath:
@@ -459,6 +452,13 @@ void CharacterController::playDeath(float startpoint, CharacterState death)
 
 void CharacterController::playRandomDeath(float startpoint)
 {
+    if (mPtr == MWBase::Environment::get().getWorld()->getPlayerPtr())
+    {
+        // The first-person animations do not include death, so we need to
+        // force-switch to third person before playing the death animation.
+        MWBase::Environment::get().getWorld()->useDeathCamera();
+    }
+
     if(MWBase::Environment::get().getWorld()->isSwimming(mPtr) && mAnimation->hasAnimation("swimdeath"))
     {
         mDeathState = CharState_SwimDeath;