diff --git a/bfdd/bfd.c b/bfdd/bfd.c
index 4662d16976..a95f4b77b8 100644
--- a/bfdd/bfd.c
+++ b/bfdd/bfd.c
@@ -418,10 +418,9 @@ static void _bfd_session_update(struct bfd_session *bs,
 			goto skip_echo;
 
 		BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
-		ptm_bfd_echo_start(bs);
 
 		/* Activate/update echo receive timeout timer. */
-		bfd_echo_recvtimer_update(bs);
+		bs_echo_timer_handler(bs);
 	} else {
 		/* Check if echo mode is already disabled. */
 		if (!BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_ECHO))
diff --git a/bfdd/bfdd_vty.c b/bfdd/bfdd_vty.c
index 032bccaf1b..a608310fdc 100644
--- a/bfdd/bfdd_vty.c
+++ b/bfdd/bfdd_vty.c
@@ -291,8 +291,7 @@ DEFPY(bfd_peer_echo, bfd_peer_echo_cmd, "[no] echo-mode",
 		BFD_SET_FLAG(bs->flags, BFD_SESS_FLAG_ECHO);
 		/* Apply setting immediately. */
 		if (!BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_SHUTDOWN)) {
-			ptm_bfd_echo_start(bs);
-			bfd_echo_recvtimer_update(bs);
+			bs_echo_timer_handler(bs);
 		}
 	}