diff --git a/orchagent/copporch.cpp b/orchagent/copporch.cpp
index 3295d401087..a8dca886292 100644
--- a/orchagent/copporch.cpp
+++ b/orchagent/copporch.cpp
@@ -89,7 +89,8 @@ static map<string, sai_hostif_trap_type_t> trap_id_map = {
     {"dest_nat_miss", SAI_HOSTIF_TRAP_TYPE_DNAT_MISS},
     {"ldp", SAI_HOSTIF_TRAP_TYPE_LDP},
     {"bfd_micro", SAI_HOSTIF_TRAP_TYPE_BFD_MICRO},
-    {"bfdv6_micro", SAI_HOSTIF_TRAP_TYPE_BFDV6_MICRO}
+    {"bfdv6_micro", SAI_HOSTIF_TRAP_TYPE_BFDV6_MICRO},
+    {"neigh_miss", SAI_HOSTIF_TRAP_TYPE_NEIGHBOR_MISS}
 };
 
 
diff --git a/tests/mock_tests/copp_cfg.json b/tests/mock_tests/copp_cfg.json
index 46d921b8276..58f127007aa 100644
--- a/tests/mock_tests/copp_cfg.json
+++ b/tests/mock_tests/copp_cfg.json
@@ -103,6 +103,10 @@
 		    "trap_ids": "src_nat_miss,dest_nat_miss",
 		    "trap_group": "queue1_group2"
 	    },
+        "neigh_miss": {
+            "trap_ids": "neigh_miss",
+            "trap_group": "queue1_group3"
+		},	
 	    "sflow": {
 		    "trap_group": "queue2_group1",
 		    "trap_ids": "sample_packet"
diff --git a/tests/test_copp.py b/tests/test_copp.py
index e7d86c41d74..2d4bdda38a9 100644
--- a/tests/test_copp.py
+++ b/tests/test_copp.py
@@ -71,7 +71,8 @@
         "dest_nat_miss": "SAI_HOSTIF_TRAP_TYPE_DNAT_MISS",
         "ldp": "SAI_HOSTIF_TRAP_TYPE_LDP",
         "bfd_micro": "SAI_HOSTIF_TRAP_TYPE_BFD_MICRO",
-        "bfdv6_micro": "SAI_HOSTIF_TRAP_TYPE_BFDV6_MICRO"
+        "bfdv6_micro": "SAI_HOSTIF_TRAP_TYPE_BFDV6_MICRO",
+        "neigh_miss": "SAI_HOSTIF_TRAP_TYPE_NEIGHBOR_MISS"
         }
 
 copp_group_default = {
@@ -127,6 +128,16 @@
         "cbs":"600",
         "red_action":"drop"
 }
+copp_group_queue1_group3 = {
+        "trap_action":"trap",
+        "trap_priority":"1",
+        "queue": "1",
+        "meter_type":"packets",
+        "mode":"sr_tcm",
+        "cir":"200",
+        "cbs":"200",
+        "red_action":"drop"
+}
 
 copp_group_queue2_group1 = {
 	"cbs": "1000",
@@ -161,6 +172,7 @@
         "udld": ["udld", copp_group_queue4_group3, "always_enabled"],
         "ip2me": ["ip2me", copp_group_queue1_group1, "always_enabled"],
         "nat": ["src_nat_miss;dest_nat_miss", copp_group_queue1_group2],
+        "neigh_miss": ["neigh_miss", copp_group_queue1_group3],
         "sflow": ["sample_packet", copp_group_queue2_group1],
         "ttl": ["ttl_error", copp_group_default]
 }