diff --git a/src/ScoreManager.cpp b/src/ScoreManager.cpp
index 7f06472c6a..659746b7e7 100644
--- a/src/ScoreManager.cpp
+++ b/src/ScoreManager.cpp
@@ -159,6 +159,10 @@ HighScore* ScoreManager::GetChartPBUpTo(string& ck, float& rate) {
 void ScoreManager::RecalculateSSRs() {
 	for(size_t i = 0; i < AllScores.size(); ++i) {
 		HighScore* hs = AllScores[i];
+
+		if (hs->GetSSRCalcVersion() == GetCalcVersion())
+			continue;
+
 		Steps* steps = SONGMAN->GetStepsByChartkey(hs->GetChartKey());
 
 		if (!steps) {
@@ -183,9 +187,6 @@ void ScoreManager::RecalculateSSRs() {
 			continue;
 		}
 
-		//if (hs->GetSSRCalcVersion() == GetCalcVersion())
-			//continue;
-
 
 		TimingData* td = steps->GetTimingData();
 		NoteData& nd = steps->GetNoteData();