diff --git a/src/RageTextureManager.cpp b/src/RageTextureManager.cpp
index ff67b4bc4f..b09c123093 100644
--- a/src/RageTextureManager.cpp
+++ b/src/RageTextureManager.cpp
@@ -344,10 +344,6 @@ RageTextureManager::GarbageCollect(GCType type)
 		if (bDeleteThis)
 			DeleteTexture(t);
 	}
-
-	// this may actually the best place for this -mina
-	LOG->Trace("Unloading replaydata.");
-	SCOREMAN->UnloadAllReplayData();
 }
 
 void
diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index 29d4553acf..0e4ae3ab1a 100644
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -50,6 +50,7 @@
 #include "XmlFileUtil.h"
 #include "Profile.h" // for replay data stuff
 #include "DownloadManager.h"
+#include "ScoreManager.h"
 
 // Defines
 #define SHOW_LIFE_METER_FOR_DISABLED_PLAYERS                                   \
@@ -306,6 +307,10 @@ ScreenGameplay::ScreenGameplay()
 #if !defined(WITHOUT_NETWORKING)
 	DLMAN->UpdateDLSpeed(true);
 #endif
+	if (GamePreferences::m_AutoPlay != PC_REPLAY) {
+		LOG->Trace("Unloading replaydata.");
+		SCOREMAN->UnloadAllReplayData();
+	}
 }
 
 void