diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index ab3b88da7a..c8e5a308ef 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -304,8 +304,8 @@ static struct peer *peer_xfer_conn(struct peer *from_peer)
 				 ? "accept"
 				 : ""),
 			peer->host, peer->fd, from_peer->fd);
-		bgp_stop(peer);
-		bgp_stop(from_peer);
+		BGP_EVENT_ADD(peer, BGP_Stop);
+		BGP_EVENT_ADD(from_peer, BGP_Stop);
 		return NULL;
 	}
 	if (from_peer->status > Active) {
@@ -1673,9 +1673,6 @@ static int bgp_fsm_open(struct peer *peer)
 	/* Send keepalive and make keepalive timer */
 	bgp_keepalive_send(peer);
 
-	/* Reset holdtimer value. */
-	BGP_TIMER_OFF(peer->t_holdtime);
-
 	return 0;
 }