diff --git a/channels/chan_agent.c b/channels/chan_agent.c
index 36066cb52bbc7cd317dcc642d29c673916a9b029..2aeebf5b108536a0222cf3e0fe40ac7e2ca39b0c 100644
--- a/channels/chan_agent.c
+++ b/channels/chan_agent.c
@@ -1507,6 +1507,7 @@ static int agent_logoff(const char *agent, int soft)
 	long logintime;
 	int ret = -1; /* Return -1 if no agent if found */
 
+	AST_LIST_LOCK(&agents);
 	AST_LIST_TRAVERSE(&agents, p, list) {
 		if (!strcasecmp(p->agent, agent)) {
 			ret = 0;
@@ -1526,6 +1527,7 @@ static int agent_logoff(const char *agent, int soft)
 			break;
 		}
 	}
+	AST_LIST_UNLOCK(&agents);
 
 	return ret;
 }
@@ -1592,20 +1594,26 @@ static int action_agent_logoff(struct mansession *s, const struct message *m)
 
 static char *complete_agent_logoff_cmd(const char *line, const char *word, int pos, int state)
 {
+	char *ret = NULL;
+
 	if (pos == 2) {
 		struct agent_pvt *p;
 		char name[AST_MAX_AGENT];
 		int which = 0, len = strlen(word);
 
+		AST_LIST_LOCK(&agents);
 		AST_LIST_TRAVERSE(&agents, p, list) {
 			snprintf(name, sizeof(name), "Agent/%s", p->agent);
-			if (!strncasecmp(word, name, len) && p->loginstart && ++which > state)
-				return ast_strdup(name);
+			if (!strncasecmp(word, name, len) && p->loginstart && ++which > state) {
+				ret = ast_strdup(name);
+				break;
+			}
 		}
+		AST_LIST_UNLOCK(&agents);
 	} else if (pos == 3 && state == 0) 
 		return ast_strdup("soft");
 	
-	return NULL;
+	return ret;
 }
 
 /*!