diff --git a/tools/gdbserver.py b/tools/gdbserver.py
index 35f5677f2c4..e6283848d53 100755
--- a/tools/gdbserver.py
+++ b/tools/gdbserver.py
@@ -819,7 +819,7 @@ class GDBStub:
         elif b"c" == pkt[1:2]:
             thread = int(pkt[2:]) - 1
 
-        if thread == -1:
+        if thread < 0:
             thread = 0
 
         self.current_thread = thread