diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index c2f5be3d9e..c9ad6b1b4b 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8502,7 +8502,7 @@ static char *complete_sip_peer(const char *word, int state, int flags2)
 	ASTOBJ_CONTAINER_TRAVERSE(&peerl, !result, do {
 		/* locking of the object is not required because only the name and flags are being compared */
 		if (!strncasecmp(word, iterator->name, wordlen) &&
-				ast_test_flag(&iterator->flags[1], flags2) &&
+				(!flags2 || ast_test_flag(&iterator->flags[1], flags2)) &&
 				++which > state)
 			result = ast_strdup(iterator->name);
 	} while(0) );