diff --git a/src/HighScore.cpp b/src/HighScore.cpp
index eb12c2e256..f99fe8b560 100644
--- a/src/HighScore.cpp
+++ b/src/HighScore.cpp
@@ -1169,8 +1169,8 @@ Grade HighScore::GetWifeGrade() const {
 }
 
 bool HighScore::WriteReplayData() {
-	return DBProfile::WriteReplayData(this);
-	//return m_Impl->WriteReplayData();
+	//return DBProfile::WriteReplayData(this);
+	return m_Impl->WriteReplayData();
 }
 
 // Ok I guess we can be more lenient and convert by midwindow values, but we still have to assume j4 - mina
diff --git a/src/StageStats.cpp b/src/StageStats.cpp
index fc3bbaac86..5d841c9932 100644
--- a/src/StageStats.cpp
+++ b/src/StageStats.cpp
@@ -333,9 +333,11 @@ void StageStats::FinalizeScores(bool bSummary)
 		hs.timeStamps.clear();
 		hs.timeStamps.shrink_to_fit();
 	}
-	bool writesuccess = hs.WriteReplayData();
-	if (writesuccess)
-		hs.UnloadReplayData();
+	if (m_player[PLAYER_1].m_fWifeScore > 0.f) {
+		bool writesuccess = hs.WriteReplayData();
+		if (writesuccess)
+			hs.UnloadReplayData();
+	}
 	zzz->SetAnyAchievedGoals(GAMESTATE->m_pCurSteps[PLAYER_1]->GetChartKey(), GAMESTATE->m_SongOptions.GetCurrent().m_fMusicRate, hs);
 	mostrecentscorekey = hs.GetScoreKey();
 	zzz->m_lastSong.FromSong(GAMESTATE->m_pCurSong);