diff --git a/Source/Core/Core/Boot/Boot.cpp b/Source/Core/Core/Boot/Boot.cpp
index c69d50b75c..57a8aab533 100644
--- a/Source/Core/Core/Boot/Boot.cpp
+++ b/Source/Core/Core/Boot/Boot.cpp
@@ -358,6 +358,7 @@ bool CBoot::BootUp()
     if (dolWii)
     {
       HID4.SBE = 1;
+      SetupMSR();
       SetupBAT(dolWii);
 
       // Because there is no TMD to get the requested system (IOS) version from,
diff --git a/Source/Core/Core/Boot/Boot.h b/Source/Core/Core/Boot/Boot.h
index 22af0f5773..65caed6dae 100644
--- a/Source/Core/Core/Boot/Boot.h
+++ b/Source/Core/Core/Boot/Boot.h
@@ -54,6 +54,7 @@ private:
   static bool Boot_ELF(const std::string& filename);
   static bool Boot_WiiWAD(const std::string& filename);
 
+  static void SetupMSR();
   static void SetupBAT(bool is_wii);
   static bool RunApploader(bool is_wii, const DiscIO::IVolume& volume);
   static bool EmulatedBS2_GC(const DiscIO::IVolume* volume, bool skip_app_loader = false);
diff --git a/Source/Core/Core/Boot/Boot_BS2Emu.cpp b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
index ad662cf7f3..8f14297f36 100644
--- a/Source/Core/Core/Boot/Boot_BS2Emu.cpp
+++ b/Source/Core/Core/Boot/Boot_BS2Emu.cpp
@@ -51,13 +51,17 @@ void CBoot::RunFunction(u32 address)
     PowerPC::SingleStep();
 }
 
-void CBoot::SetupBAT(bool is_wii)
+void CBoot::SetupMSR()
 {
   UReg_MSR& m_MSR = ((UReg_MSR&)PowerPC::ppcState.msr);
   m_MSR.FP = 1;
   m_MSR.DR = 1;
   m_MSR.IR = 1;
   m_MSR.EE = 1;
+}
+
+void CBoot::SetupBAT(bool is_wii)
+{
   PowerPC::ppcState.spr[SPR_IBAT0U] = 0x80001fff;
   PowerPC::ppcState.spr[SPR_IBAT0L] = 0x00000002;
   PowerPC::ppcState.spr[SPR_DBAT0U] = 0x80001fff;
@@ -155,6 +159,7 @@ bool CBoot::EmulatedBS2_GC(const DiscIO::IVolume* volume, bool skip_app_loader)
 {
   INFO_LOG(BOOT, "Faking GC BS2...");
 
+  SetupMSR();
   SetupBAT(/*is_wii*/ false);
 
   // Write necessary values
@@ -346,6 +351,7 @@ bool CBoot::EmulatedBS2_Wii(const DiscIO::IVolume* volume)
   // after this check during booting.
   DVDRead(*volume, 0, 0x3180, 4, true);
 
+  SetupMSR();
   SetupBAT(/*is_wii*/ true);
 
   Memory::Write_U32(0x4c000064, 0x00000300);  // Write default DSI Handler:   rfi
diff --git a/Source/Core/Core/Boot/Boot_ELF.cpp b/Source/Core/Core/Boot/Boot_ELF.cpp
index 9130fafdfc..1cef0937ba 100644
--- a/Source/Core/Core/Boot/Boot_ELF.cpp
+++ b/Source/Core/Core/Boot/Boot_ELF.cpp
@@ -70,6 +70,7 @@ bool CBoot::Boot_ELF(const std::string& filename)
   const bool is_wii = IsElfWii(filename);
   if (is_wii)
     HID4.SBE = 1;
+  SetupMSR();
   SetupBAT(is_wii);
 
   if (!reader.LoadSymbols())