diff --git a/src/Ryujinx.HLE/Debugger/Debugger.cs b/src/Ryujinx.HLE/Debugger/Debugger.cs
index 4a4979a9c..840faf619 100644
--- a/src/Ryujinx.HLE/Debugger/Debugger.cs
+++ b/src/Ryujinx.HLE/Debugger/Debugger.cs
@@ -167,6 +167,9 @@ namespace Ryujinx.HLE.Debugger
                         DebugProcess.DebugStop();
                         Reply($"T05thread:{ctx.ThreadUid:x};");
                         break;
+
+                    case KillMessage:
+                        return;
                 }
             }
         }
@@ -732,8 +735,9 @@ namespace Ryujinx.HLE.Debugger
                 ReadStream?.Close();
                 WriteStream?.Close();
                 DebuggerThread.Join();
-                Messages.Dispose();
+                Messages.Add(new KillMessage());
                 MessageHandlerThread.Join();
+                Messages.Dispose();
             }
         }
 
diff --git a/src/Ryujinx.HLE/Debugger/Message/KillMessage.cs b/src/Ryujinx.HLE/Debugger/Message/KillMessage.cs
new file mode 100644
index 000000000..43ae0f21e
--- /dev/null
+++ b/src/Ryujinx.HLE/Debugger/Message/KillMessage.cs
@@ -0,0 +1,6 @@
+namespace Ryujinx.HLE.Debugger
+{
+    struct KillMessage : IMessage
+    {
+    }
+}