diff --git a/stepmania/src/Background.cpp b/stepmania/src/Background.cpp
index 388ec76965..368cff3479 100644
--- a/stepmania/src/Background.cpp
+++ b/stepmania/src/Background.cpp
@@ -849,7 +849,7 @@ void BackgroundImpl::Update( float fDeltaTime )
 
 	FOREACH_PlayerNumber( p )
 	{
-		if( GAMESTATE->IsPlayerInDanger(GAMESTATE->m_pPlayerState[p]) )
+		if( PREFSMAN->m_bShowDanger && GAMESTATE->IsPlayerInDanger(GAMESTATE->m_pPlayerState[p]) )
 			m_DangerPlayer[p]->Update( fDeltaTime );
 			
 		if( GAMESTATE->IsPlayerDead(GAMESTATE->m_pPlayerState[p]) )
@@ -910,7 +910,7 @@ void BackgroundImpl::DrawPrimitives()
 
 		FOREACH_PlayerNumber( p )
 		{
-			if( GAMESTATE->IsPlayerInDanger(GAMESTATE->m_pPlayerState[p]) )
+			if( PREFSMAN->m_bShowDanger && GAMESTATE->IsPlayerInDanger(GAMESTATE->m_pPlayerState[p]) )
 				m_DangerPlayer[p]->Draw();
 			if( GAMESTATE->IsPlayerDead(GAMESTATE->m_pPlayerState[p]) )
 				m_DeadPlayer[p]->Draw();
diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp
index c1621959fb..5adc718e26 100644
--- a/stepmania/src/GameState.cpp
+++ b/stepmania/src/GameState.cpp
@@ -1742,8 +1742,6 @@ bool GameState::IsPlayerInDanger( const PlayerState *pPlayerState ) const
 {
 	if( GetPlayerFailType(pPlayerState) == SongOptions::FAIL_OFF )
 		return false;
-	if( !PREFSMAN->m_bShowDanger )
-		return false;
 	return pPlayerState->m_HealthState == PlayerState::DANGER;
 }