diff --git a/bgpd/bgp_clist.c b/bgpd/bgp_clist.c
index ad154e638b55..61ba527498ca 100644
--- a/bgpd/bgp_clist.c
+++ b/bgpd/bgp_clist.c
@@ -182,7 +182,7 @@ community_list_insert(struct community_list_handler *ch, const char *name,
 	}
 
 	/* In case of name is all digit character */
-	if (i == strlen(name)) {
+	if (i == strlen(name) && number <= COMMUNITY_LIST_NUMBER_MAX) {
 		new->sort = COMMUNITY_LIST_NUMBER;
 
 		/* Set access_list to number list. */
diff --git a/bgpd/bgp_clist.h b/bgpd/bgp_clist.h
index 29bd880c937e..7f35a6d53e4b 100644
--- a/bgpd/bgp_clist.h
+++ b/bgpd/bgp_clist.h
@@ -20,6 +20,10 @@
 /* Number and string based community-list name.  */
 #define COMMUNITY_LIST_STRING          0
 #define COMMUNITY_LIST_NUMBER          1
+/* The numbered community-list (including large/ext communities)
+ * have a range between 1-500.
+ */
+#define COMMUNITY_LIST_NUMBER_MAX 500
 
 #define COMMUNITY_SEQ_NUMBER_AUTO     -1