diff --git a/source/player/pmdead.cpp b/source/player/pmdead.cpp
index b2d7f104c..decc50044 100644
--- a/source/player/pmdead.cpp
+++ b/source/player/pmdead.cpp
@@ -124,7 +124,10 @@ void	CPlayerModeDead::think()
 		m_player->setAnimFrame(frame);
 	}
 
-	m_player->moveVertical(5);
+	if(m_player->getPos().vy<(GameScene.GetLevel().getMapSize().vy+4)*16)
+	{
+		m_player->moveVertical(5);
+	}
 
 	if(!m_killed)
 	{
diff --git a/source/player/pmdead.h b/source/player/pmdead.h
index 33780bc39..66eb51bf4 100644
--- a/source/player/pmdead.h
+++ b/source/player/pmdead.h
@@ -45,8 +45,8 @@ private:
 	// Player can press ACTION to respawn after death
 	enum
 	{
-		DEATH_DELAY=2*60,		// Can't force a respawn for this long
-		DEATH_TIMEOUT=5*60,		// SB respawns automatically after this long
+		DEATH_DELAY=1*60,		// Can't force a respawn for this long
+		DEATH_TIMEOUT=4*60,		// SB respawns automatically after this long
 	};
 	int				m_deadTime;
 	int				m_deathAnim;