diff --git a/stepmania/src/ProfileManager.cpp b/stepmania/src/ProfileManager.cpp
index 5b32ecc6da..8a2e1bdfac 100644
--- a/stepmania/src/ProfileManager.cpp
+++ b/stepmania/src/ProfileManager.cpp
@@ -654,7 +654,9 @@ void ProfileManager::AddStepsScore( const Song* pSong, const Steps* pSteps, Play
 	if( IsPersistentProfile(pn) )
 		GetProfile(pn)->AddStepsHighScore( pSong, pSteps, hs, iPersonalIndexOut );
 
-	if( hs.GetPercentDP() >= PREFSMAN->m_fMinPercentageForMachineSongHighScore )
+	// don't save machine scores for a failed song
+	if( hs.GetPercentDP() >= PREFSMAN->m_fMinPercentageForMachineSongHighScore &&
+		hs.GetGrade() != Grade_Failed )
 	{
 		// don't leave machine high scores for edits loaded from the player's card
 		if( !pSteps->IsAPlayerEdit() )
diff --git a/stepmania/src/StageStats.cpp b/stepmania/src/StageStats.cpp
index da3e006068..e20b9196b1 100644
--- a/stepmania/src/StageStats.cpp
+++ b/stepmania/src/StageStats.cpp
@@ -224,10 +224,6 @@ void StageStats::CommitScores( bool bSummary )
 		}
 		else
 		{
-			// don't save scores for a failed song
-			if( m_player[p].m_bFailed )
-				continue;
-
 			ASSERT( pSteps );
 
 			PROFILEMAN->AddStepsScore( pSong, pSteps, p, hs, m_player[p].m_iPersonalHighScoreIndex, m_player[p].m_iMachineHighScoreIndex );