diff --git a/components/debuggerintf/dbgintfdebuggerbase.pp b/components/debuggerintf/dbgintfdebuggerbase.pp
index 241f514911..410b08b81d 100644
--- a/components/debuggerintf/dbgintfdebuggerbase.pp
+++ b/components/debuggerintf/dbgintfdebuggerbase.pp
@@ -2445,7 +2445,7 @@ procedure TThreads.Add(AThread: TThreadEntry);
 begin
   FList.Add(AThread.CreateCopy);
   if FList.Count = 1 then
-    FCurrentThreadId := AThread.ThreadId;
+    FCurrentThreadId := AThread.ThreadId; // TODO: this should never be needed?
 end;
 
 procedure TThreads.Remove(AThread: TThreadEntry);
diff --git a/components/lazdebuggergdbmi/gdbmidebugger.pp b/components/lazdebuggergdbmi/gdbmidebugger.pp
index 7aa203094d..dd2df6a3b4 100644
--- a/components/lazdebuggergdbmi/gdbmidebugger.pp
+++ b/components/lazdebuggergdbmi/gdbmidebugger.pp
@@ -3154,8 +3154,8 @@ begin
   for i := 0 to Cmd.Count - 1 do
     CurrentThreads.Add(Cmd.Threads[i]);
 
-  CurrentThreads.SetValidity(ddsValid);
   CurrentThreads.CurrentThreadId := Cmd.CurrentThreadId;
+  CurrentThreads.SetValidity(ddsValid);
   Debugger.FCurrentThreadId := CurrentThreads.CurrentThreadId;
   Debugger.FCurrentThreadIdValid := True;
 end;