diff --git a/lib/roken/resolve.c b/lib/roken/resolve.c
index 269424b50..5aa45d045 100644
--- a/lib/roken/resolve.c
+++ b/lib/roken/resolve.c
@@ -453,7 +453,7 @@ dns_srv_order(struct dns_reply *r)
 	    headp = &(*tt)->next;
 	    sum -= (*tt)->u.srv->weight;
 	    *tt = NULL;
-	    while(*ss == NULL)
+	    while(ss < ee && *ss == NULL)
 		ss++;
 	}
     }