diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 6ee5b5dc5c..b030c455bc 100644
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -889,8 +889,6 @@ static int bgp_capability_software_version(struct peer *peer,
 	size_t end = stream_get_getp(s) + hdr->length;
 	uint8_t len;
 
-	SET_FLAG(peer->cap, PEER_CAP_SOFT_VERSION_RCV);
-
 	len = stream_getc(s);
 	if (stream_get_getp(s) + len > end) {
 		flog_warn(
@@ -900,6 +898,8 @@ static int bgp_capability_software_version(struct peer *peer,
 		return -1;
 	}
 
+	SET_FLAG(peer->cap, PEER_CAP_SOFT_VERSION_RCV);
+
 	if (len > BGP_MAX_SOFT_VERSION) {
 		flog_warn(EC_BGP_CAPABILITY_INVALID_LENGTH,
 			  "%s: Received Software Version, but the length is too big, truncating, from peer %s",
diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py
index db1eb2723b..75c712eb84 100644
--- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py
+++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_graceful_restart.py
@@ -68,6 +68,11 @@ def test_bgp_dynamic_capability_graceful_restart():
                     "gracefulRestart": "advertisedAndReceived",
                     "longLivedGracefulRestart": "advertisedAndReceived",
                 },
+                "addressFamilyInfo": {
+                    "ipv4Unicast": {
+                        "acceptedPrefixCounter": 2,
+                    }
+                },
                 "gracefulRestartInfo": {
                     "nBit": True,
                     "timers": {
@@ -116,6 +121,11 @@ def test_bgp_dynamic_capability_graceful_restart():
                     "gracefulRestart": "advertisedAndReceived",
                     "longLivedGracefulRestart": "advertisedAndReceived",
                 },
+                "addressFamilyInfo": {
+                    "ipv4Unicast": {
+                        "acceptedPrefixCounter": 2,
+                    }
+                },
                 "gracefulRestartInfo": {
                     "nBit": True,
                     "timers": {
diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py
index da45110e39..576ef740b2 100644
--- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py
+++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_role.py
@@ -66,6 +66,11 @@ def test_bgp_dynamic_capability_role():
                 "neighborCapabilities": {
                     "dynamic": "advertisedAndReceived",
                 },
+                "addressFamilyInfo": {
+                    "ipv4Unicast": {
+                        "acceptedPrefixCounter": 2,
+                    }
+                },
             }
         }
         return topotest.json_cmp(output, expected)
@@ -108,6 +113,11 @@ def test_bgp_dynamic_capability_role():
                     "dynamic": "advertisedAndReceived",
                     "role": "advertisedAndReceived",
                 },
+                "addressFamilyInfo": {
+                    "ipv4Unicast": {
+                        "acceptedPrefixCounter": 2,
+                    }
+                },
                 "messageStats": {
                     "notificationsRecv": 0,
                     "capabilityRecv": 1,
diff --git a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py
index a653da4655..002d7828c4 100644
--- a/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py
+++ b/tests/topotests/bgp_dynamic_capability/test_bgp_dynamic_capability_software_version.py
@@ -68,6 +68,11 @@ def test_bgp_dynamic_capability_software_version():
                         "receivedSoftwareVersion": None,
                     },
                 },
+                "addressFamilyInfo": {
+                    "ipv4Unicast": {
+                        "acceptedPrefixCounter": 2,
+                    }
+                },
             }
         }
         return topotest.json_cmp(output, expected)
@@ -129,6 +134,11 @@ def test_bgp_dynamic_capability_software_version():
                         "receivedSoftwareVersion": rcv,
                     },
                 },
+                "addressFamilyInfo": {
+                    "ipv4Unicast": {
+                        "acceptedPrefixCounter": 2,
+                    }
+                },
                 "messageStats": {
                     "notificationsRecv": 0,
                     "capabilityRecv": 1,