diff --git a/client/ip65/udp.s b/client/ip65/udp.s
index db5f313..83fb2a3 100644
--- a/client/ip65/udp.s
+++ b/client/ip65/udp.s
@@ -208,7 +208,8 @@ udp_remove_listener:
 	stx port + 1
 
 	ldy udp_cbcount			; any listeners installed?
-	beq @notfound
+	beq @notfound
+  dey
 @check:
 	lda udp_cbportlo,y		; check if port is handled
 	cmp port
@@ -216,9 +217,8 @@ udp_remove_listener:
 	lda udp_cbporthi,y
 	cmp port + 1
 	beq @remove
-:	iny
-	cpy udp_cbcount
-	bne @check
+:	dey
+	bpl @check
 @notfound:
 	sec
 	rts