diff --git a/rpcs3/Emu/SysCalls/ModuleManager.cpp b/rpcs3/Emu/SysCalls/ModuleManager.cpp
index 72be0defa3..e8936c16a8 100644
--- a/rpcs3/Emu/SysCalls/ModuleManager.cpp
+++ b/rpcs3/Emu/SysCalls/ModuleManager.cpp
@@ -171,6 +171,8 @@ void ModuleManager::Init()
 {
 	if (!initialized)
 	{
+		clear_ppu_functions();
+
 		for (auto& m : g_module_list)
 		{
 			if (m.module)
diff --git a/rpcs3/Emu/System.cpp b/rpcs3/Emu/System.cpp
index 26a3a26cb6..cae1afd595 100644
--- a/rpcs3/Emu/System.cpp
+++ b/rpcs3/Emu/System.cpp
@@ -376,8 +376,6 @@ void Emulator::Stop()
 
 	// TODO: check finalization order
 
-	clear_ppu_functions();
-
 	SavePoints(BreakPointsDBName);
 	m_break_points.clear();
 	m_marked_points.clear();