diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index 0b8a681754..4e35951f89 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -2296,8 +2296,10 @@ static char *complete_peer_helper(const char *line, const char *word, int pos, i
 	len = strlen(word);
 	AST_LIST_TRAVERSE(&peers, p, list) {
 		const char *s = dundi_eid_to_str(eid_str, sizeof(eid_str), &p->eid);
-		if (!strncasecmp(word, s, len) && ++which > state)
+		if (!strncasecmp(word, s, len) && ++which > state) {
 			ret = ast_strdup(s);
+			break;
+		}
 	}
 	AST_LIST_UNLOCK(&peers);
 	return ret;