diff --git a/bgpd/bgp_bmp.c b/bgpd/bgp_bmp.c
index 2e3a0388d0ed..d6df56026078 100644
--- a/bgpd/bgp_bmp.c
+++ b/bgpd/bgp_bmp.c
@@ -467,13 +467,19 @@ static struct stream *bmp_peerstate(struct peer *peer, bool down)
 	struct stream *s;
 	size_t len;
 	struct timeval uptime, uptime_real;
+	uint8_t peer_type;
+	bool is_locrib = false;
 
 	uptime.tv_sec = peer->uptime;
 	uptime.tv_usec = 0;
 	monotime_to_realtime(&uptime, &uptime_real);
 
-	uint8_t peer_type = bmp_get_peer_type(peer);
-	bool is_locrib = peer_type == BMP_PEER_TYPE_LOC_RIB_INSTANCE;
+	peer_type = bmp_get_peer_type(peer);
+	if (peer_type == BMP_PEER_TYPE_LOC_RIB_INSTANCE)
+		is_locrib = true;
+	else
+		/* TODO: remove this when other RD and local instances supported */
+		peer_type = BMP_PEER_TYPE_GLOBAL_INSTANCE;
 
 #define BGP_BMP_MAX_PACKET_SIZE	1024
 #define BMP_PEERUP_INFO_TYPE_STRING 0
@@ -484,9 +490,7 @@ static struct stream *bmp_peerstate(struct peer *peer, bool down)
 
 		bmp_common_hdr(s, BMP_VERSION_3,
 				BMP_TYPE_PEER_UP_NOTIFICATION);
-		bmp_per_peer_hdr(s, peer->bgp, peer, 0,
-				 BMP_PEER_TYPE_GLOBAL_INSTANCE, 0,
-				 &uptime_real);
+		bmp_per_peer_hdr(s, peer->bgp, peer, 0, peer_type, 0, &uptime_real);
 
 		/* Local Address (16 bytes) */
 		if (is_locrib)
diff --git a/tests/topotests/bgp_bmp/bgpbmp.py b/tests/topotests/bgp_bmp/bgpbmp.py
index 41995e2b5e53..5e8b0d9be72d 100644
--- a/tests/topotests/bgp_bmp/bgpbmp.py
+++ b/tests/topotests/bgp_bmp/bgpbmp.py
@@ -216,11 +216,16 @@ def bmp_check_for_peer_message(
     ]
 
     # get the list of pairs (prefix, policy, seq) for the given message type
-    peers = [
-        m["peer_ip"]
-        for m in messages
-        if "peer_ip" in m.keys() and m["bmp_log_type"] == bmp_log_type
-    ]
+    peers = []
+    for m in messages:
+        if (
+            "peer_ip" in m.keys()
+            and m["peer_ip"] != "0.0.0.0"
+            and m["bmp_log_type"] == bmp_log_type
+        ):
+            peers.append(m["peer_ip"])
+        elif m["policy"] == "loc-rib" and m["bmp_log_type"] == bmp_log_type:
+            peers.append("0.0.0.0")
 
     # check for prefixes
     for ep in expected_peers:
diff --git a/tests/topotests/bgp_bmp/test_bgp_bmp_1.py b/tests/topotests/bgp_bmp/test_bgp_bmp_1.py
index 61428634414c..be3e07929a0f 100644
--- a/tests/topotests/bgp_bmp/test_bgp_bmp_1.py
+++ b/tests/topotests/bgp_bmp/test_bgp_bmp_1.py
@@ -192,7 +192,7 @@ def test_peer_up():
     """
 
     tgen = get_topogen()
-    peers = ["192.168.0.2", "192:168::2"]
+    peers = ["192.168.0.2", "192:168::2", "0.0.0.0"]
 
     logger.info("checking for BMP peers up messages")
 
diff --git a/tests/topotests/bgp_bmp/test_bgp_bmp_2.py b/tests/topotests/bgp_bmp/test_bgp_bmp_2.py
index b45452e7c475..e8f67515bd5d 100644
--- a/tests/topotests/bgp_bmp/test_bgp_bmp_2.py
+++ b/tests/topotests/bgp_bmp/test_bgp_bmp_2.py
@@ -200,7 +200,7 @@ def test_peer_up():
     """
 
     tgen = get_topogen()
-    peers = ["192.168.0.2", "192:168::2"]
+    peers = ["192.168.0.2", "192:168::2", "0.0.0.0"]
 
     logger.info("checking for BMP peers up messages")