diff --git a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
index d5d8910f9b..15aef31673 100644
--- a/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Sony/PSX/Octoshock.cs
@@ -366,7 +366,7 @@ namespace BizHawk.Emulation.Cores.Sony.PSX
 
 			int w = fb.width;
 			int h = fb.height;
-		BufferWidth = w;
+			BufferWidth = w;
 			BufferHeight = h;
 
 			switch (_Settings.ResolutionMode)
diff --git a/output/dll/octoshock.dll b/output/dll/octoshock.dll
index 4cc4ea8a1f..30c0f64c9b 100644
Binary files a/output/dll/octoshock.dll and b/output/dll/octoshock.dll differ
diff --git a/psx/octoshock/psx/psx.cpp b/psx/octoshock/psx/psx.cpp
index 20cd933ceb..6d8f8ac71a 100644
--- a/psx/octoshock/psx/psx.cpp
+++ b/psx/octoshock/psx/psx.cpp
@@ -1877,7 +1877,7 @@ EW_EXPORT s32 shock_SetDisc(void* psx, ShockDiscRef* disc)
 	s_CurrDisc = disc;
 
 	//set the disc to the CDC, but since its necessarily open to insert, this is false
-	CDC->SetDisc(false,s_CurrDisc,s_CurrDiscInfo.id);
+	CDC->SetDisc(true,s_CurrDisc,s_CurrDiscInfo.id);
 
 	return SHOCK_OK;
 }