diff --git a/src/jtag/drivers/cmsis_dap_usb.c b/src/jtag/drivers/cmsis_dap_usb.c
index 5072de0c7..7d4c579ae 100644
--- a/src/jtag/drivers/cmsis_dap_usb.c
+++ b/src/jtag/drivers/cmsis_dap_usb.c
@@ -193,6 +193,8 @@ static int cmsis_dap_usb_open(void)
 				if ((cmsis_dap_vid[i] == cur_dev->vendor_id) && (cmsis_dap_pid[i] == cur_dev->product_id))
 					break;
 			}
+			if (cmsis_dap_vid[i] || cmsis_dap_pid[i])
+				break;
 		}
 
 		cur_dev = cur_dev->next;