diff --git a/tools/adb_device.py b/tools/adb_device.py
index 9b113c5d0..e77705a74 100755
--- a/tools/adb_device.py
+++ b/tools/adb_device.py
@@ -29,9 +29,9 @@ def _device_list(adb: str) -> list[str]:
         raise DeviceResolutionError(result.stderr.strip() or "adb devices failed")
     devices = []
     for line in result.stdout.splitlines()[1:]:
-        fields = line.split()
-        if len(fields) >= 2 and fields[1] == "device":
-            devices.append(fields[0])
+        match = re.match(r"^(.+?)\s+device(?:\s+\S+:\S+)*\s*$", line)
+        if match:
+            devices.append(match.group(1))
     return devices