diff --git a/src/game/server/player.cpp b/src/game/server/player.cpp
index b8a0519d2..0b151b20c 100644
--- a/src/game/server/player.cpp
+++ b/src/game/server/player.cpp
@@ -2152,8 +2152,11 @@ void CBasePlayer::PlayerDeathThink(void)
 	// wait for all buttons released
 	if (m_lifeState == LIFE_DEAD)
 	{
-		if (fAnyButtonDown)
+		if ( fAnyButtonDown && ( gpGlobals->curtime > ( m_flDeathTime + 5 ) ) )
+		{
+			respawn( this, !IsObserver() );// don't copy a corpse if we're in deathcam.
 			return;
+		}
 
 		if ( g_pGameRules->FPlayerCanRespawn( this ) )
 		{