diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
index 13c4658ca7..0346f06d39 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/NDS/MelonDS.cs
@@ -500,7 +500,15 @@ namespace BizHawk.Emulation.Cores.Consoles.Nintendo.NDS
 		{
 			_isDisposing = true;
 			_frameThreadStartEvent.Release();
-			_frameThread?.Join();
+
+			if (_frameThread != null)
+			{
+				while (_frameThread.IsAlive)
+				{
+					Thread.Sleep(1);
+				}
+			}
+
 			_frameThreadStartEvent.Dispose();
 			_frameThreadEndEvent.Dispose();