diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index 4782c45c8d..699f799be9 100644
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -2231,6 +2231,19 @@ ScreenGameplay::SaveStats()
 		NoteDataWithScoring::GetActualRadarValues(nd, pss, fMusicLen, rv);
 		pss.m_radarActual += rv;
 		GAMESTATE->SetProcessedTimingData(NULL);
+	}
+	if (GamePreferences::m_AutoPlay.Get() == PC_REPLAY) {
+		// We need to replace the newly created replay data with the actual old
+		// data Because to keep consistently lazy practices, we can just hack
+		// things together instead of fixing the real issue -poco
+		// (doing this fixes a lot of issues in the eval screen)
+		PlayerStageStats* pss = m_vPlayerInfo[PLAYER_1].GetPlayerStageStats();
+		HighScore* hs = PlayerAI::pScoreData;
+		pss->m_vHoldReplayData = hs->GetHoldReplayDataVector();
+		pss->m_vNoteRowVector = hs->GetNoteRowVector();
+		pss->m_vOffsetVector = hs->GetOffsetVector();
+		pss->m_vTapNoteTypeVector = hs->GetTapNoteTypeVector();
+		pss->m_vTrackVector = hs->GetTrackVector();
 	}
 }