diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index 78554893ff15..9c194eac1c2a 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -3734,7 +3734,10 @@ static int bgp_capability_msg_parse(struct peer *peer, uint8_t *pnt,
 			zlog_err("%pBP: Capability length error", peer);
 			bgp_notify_send(peer->connection, BGP_NOTIFY_CEASE,
 					BGP_NOTIFY_SUBCODE_UNSPECIFIC);
-			pnt += length;
+			/*
+			 * If we did not return then
+			 * pnt += length;
+			 */
 			return BGP_Stop;
 		}
 		action = *pnt;
@@ -3759,7 +3762,10 @@ static int bgp_capability_msg_parse(struct peer *peer, uint8_t *pnt,
 			zlog_err("%pBP: Capability length error", peer);
 			bgp_notify_send(peer->connection, BGP_NOTIFY_CEASE,
 					BGP_NOTIFY_SUBCODE_UNSPECIFIC);
-			pnt += length;
+			/*
+			 * If we did not return then
+			 * pnt += length;
+			 */
 			return BGP_Stop;
 		}