diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 01d73e9b07..99ffe9549f 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -2917,6 +2917,7 @@ static int bgp_capability_msg_parse(struct peer *peer, uint8_t *pnt,
 				peer->remote_role = role;
 			} else {
 				UNSET_FLAG(peer->cap, PEER_CAP_ROLE_RCV);
+				peer->remote_role = ROLE_UNDEFINED;
 			}
 			break;
 		default: