diff --git a/internal/pkg/table/table.go b/internal/pkg/table/table.go
index 48f410ec3..7a1e9685c 100644
--- a/internal/pkg/table/table.go
+++ b/internal/pkg/table/table.go
@@ -16,6 +16,7 @@
 package table
 
 import (
+	"encoding/binary"
 	"fmt"
 	"math/bits"
 	"net"
@@ -439,11 +440,15 @@ func (t *Table) tableKey(nlri bgp.AddrPrefixInterface) string {
 	case *bgp.EVPNNLRI:
 		switch U := T.RouteTypeData.(type) {
 		case *bgp.EVPNMacIPAdvertisementRoute:
-			b := make([]byte, 15)
+			b := make([]byte, 0, 37)
 			serializedRD, _ := U.RD.Serialize()
-			copy(b, serializedRD)
-			b[8] = bgp.EVPN_ROUTE_TYPE_MAC_IP_ADVERTISEMENT
-			copy(b[9:15], U.MacAddress)
+			b = append(b, serializedRD...)
+			b = append(b, bgp.EVPN_ROUTE_TYPE_MAC_IP_ADVERTISEMENT)
+			b = append(b, U.MacAddressLength)
+			b = append(b, U.MacAddress...)
+			b = binary.LittleEndian.AppendUint32(b, U.ETag)
+			b = append(b, U.IPAddressLength)
+			b = append(b, U.IPAddress...)
 			return *(*string)(unsafe.Pointer(&b))
 		}
 	}
diff --git a/internal/pkg/table/table_test.go b/internal/pkg/table/table_test.go
index 0a9fd2402..d1428a60f 100644
--- a/internal/pkg/table/table_test.go
+++ b/internal/pkg/table/table_test.go
@@ -393,6 +393,98 @@ func TestTableSelectVPNv6(t *testing.T) {
 	}
 }
 
+func TestTableKeyEVPNMacIPAdvertisementRoute(t *testing.T) {
+	assert := assert.New(t)
+	table := NewTable(logger, bgp.RF_EVPN)
+
+	rd := bgp.NewRouteDistinguisherFourOctetAS(1, 2)
+	esi := bgp.EthernetSegmentIdentifier{}
+	var etag uint32 = 3
+	mac := "00:11:22:33:44:55"
+	ip := "11.11.11.11"
+	labels := []uint32{}
+
+	key_orig := table.tableKey(bgp.NewEVPNMacIPAdvertisementRoute(
+		rd,
+		esi,
+		etag,
+		mac,
+		ip,
+		labels))
+
+	key_rd := table.tableKey(bgp.NewEVPNMacIPAdvertisementRoute(
+		bgp.NewRouteDistinguisherFourOctetAS(3, 4),
+		esi,
+		etag,
+		mac,
+		ip,
+		labels))
+	assert.NotEqual(key_orig, key_rd)
+
+	key_etag := table.tableKey(bgp.NewEVPNMacIPAdvertisementRoute(
+		rd,
+		esi,
+		5,
+		mac,
+		ip,
+		labels))
+	assert.NotEqual(key_orig, key_etag)
+
+	key_mac := table.tableKey(bgp.NewEVPNMacIPAdvertisementRoute(
+		rd,
+		esi,
+		etag,
+		"00:aa:bb:cc:dd:ee",
+		ip,
+		labels))
+	assert.NotEqual(key_orig, key_mac)
+
+	key_ip_empty := table.tableKey(bgp.NewEVPNMacIPAdvertisementRoute(
+		rd,
+		esi,
+		etag,
+		mac,
+		"",
+		labels))
+	assert.NotEqual(key_orig, key_ip_empty)
+
+	key_ipv4 := table.tableKey(bgp.NewEVPNMacIPAdvertisementRoute(
+		rd,
+		esi,
+		etag,
+		mac,
+		"22.22.22.22",
+		labels))
+	assert.NotEqual(key_orig, key_ipv4)
+
+	key_ipv6_1 := table.tableKey(bgp.NewEVPNMacIPAdvertisementRoute(
+		rd,
+		esi,
+		etag,
+		mac,
+		"bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb",
+		labels))
+	assert.NotEqual(key_orig, key_ipv6_1)
+
+	key_ipv6_2 := table.tableKey(bgp.NewEVPNMacIPAdvertisementRoute(
+		rd,
+		esi,
+		etag,
+		mac,
+		"bbbb:bbbb::",
+		labels))
+	assert.NotEqual(key_orig, key_ipv6_2)
+
+	key_ipv6_3 := table.tableKey(bgp.NewEVPNMacIPAdvertisementRoute(
+		rd,
+		esi,
+		etag,
+		mac,
+		"::bbbb:bbbb",
+		labels))
+	assert.NotEqual(key_orig, key_ipv6_3)
+}
+
 func TableCreatePeer() []*PeerInfo {
 	peerT1 := &PeerInfo{AS: 65000}
 	peerT2 := &PeerInfo{AS: 65001}