diff --git a/Core/System.cpp b/Core/System.cpp
index 75be55a5a3..4fbe1eaf86 100644
--- a/Core/System.cpp
+++ b/Core/System.cpp
@@ -545,6 +545,8 @@ bool PSP_IsQuitting() {
 }
 
 void PSP_Shutdown() {
+	Achievements::UnloadGame();
+
 	// Do nothing if we never inited.
 	if (!pspIsInited && !pspIsIniting && !pspIsQuitting) {
 		return;
diff --git a/UI/EmuScreen.cpp b/UI/EmuScreen.cpp
index 9cd0a4a1aa..1b87edd8be 100644
--- a/UI/EmuScreen.cpp
+++ b/UI/EmuScreen.cpp
@@ -405,7 +405,6 @@ void EmuScreen::bootComplete() {
 
 EmuScreen::~EmuScreen() {
 	// If we were invalid, it would already be shutdown.
-	Achievements::UnloadGame();
 	if (!invalid_ || bootPending_) {
 		PSP_Shutdown();
 	}