diff --git a/src/Ryujinx.HLE/Debugger/Debugger.cs b/src/Ryujinx.HLE/Debugger/Debugger.cs
index 608ab977a..dd6394e60 100644
--- a/src/Ryujinx.HLE/Debugger/Debugger.cs
+++ b/src/Ryujinx.HLE/Debugger/Debugger.cs
@@ -916,6 +916,7 @@ namespace Ryujinx.HLE.Debugger
 
         public void BreakHandler(IExecutionContext ctx, ulong address, int imm)
         {
+            gThread = cThread = ctx.ThreadUid;
             Logger.Notice.Print(LogClass.GdbStub, $"Break hit on thread {ctx.ThreadUid} at pc {address:x016}");
 
             Messages.Add(new ThreadBreakMessage(ctx, address, imm));