diff --git a/Core/HLE/sceKernel.cpp b/Core/HLE/sceKernel.cpp
index 86241a7239..efc63c1b85 100644
--- a/Core/HLE/sceKernel.cpp
+++ b/Core/HLE/sceKernel.cpp
@@ -144,6 +144,7 @@ void __KernelInit()
 	__PowerInit();
 	__UtilityInit();
 	__UmdInit();
+	__MpegBaseInit();
 	__MpegInit();
 	__PsmfInit();
 	__CtrlInit();
@@ -210,6 +211,7 @@ void __KernelShutdown()
 
 	__Mp3Shutdown();
 	__MpegShutdown();
+	__MpegBaseShutdown();
 	__PsmfShutdown();
 	__PPGeShutdown();
 
diff --git a/Core/HLE/sceMpeg.cpp b/Core/HLE/sceMpeg.cpp
index b627583cd8..5871db61e9 100644
--- a/Core/HLE/sceMpeg.cpp
+++ b/Core/HLE/sceMpeg.cpp
@@ -356,7 +356,6 @@ static void ClearMpegContexts() {
 }
 
 void __MpegInit() {
-	__MpegBaseInit();
 	// getMpegCtx keys on a handle read out of game memory, so don't leave contexts from a previous
 	// game around for the next one to find.
 	ClearMpegContexts();
@@ -414,7 +413,6 @@ void __MpegDoState(PointerWrap &p) {
 
 void __MpegShutdown() {
 	ClearMpegContexts();
-	__MpegBaseShutdown();
 }
 
 void __MpegLoadModule(int version,u32 crc) {
diff --git a/Core/HLE/sceMpegbase.h b/Core/HLE/sceMpegbase.h
index 397fbd0945..2ce7fcc395 100644
--- a/Core/HLE/sceMpegbase.h
+++ b/Core/HLE/sceMpegbase.h
@@ -25,7 +25,7 @@ class PointerWrap;
 
 void Register_sceMpegbase();
 
-// Called per boot, from __MpegInit and __MpegShutdown.
+// Called per boot, from __KernelInit and __KernelShutdown, around sceMpeg's own pair.
 void __MpegBaseInit();
 void __MpegBaseShutdown();