diff --git a/bfdd/bfdd_cli.c b/bfdd/bfdd_cli.c
index 84354e243d..5072c76aac 100644
--- a/bfdd/bfdd_cli.c
+++ b/bfdd/bfdd_cli.c
@@ -57,6 +57,12 @@ bfd_cli_is_single_hop(struct vty *vty)
 	return strstr(VTY_CURR_XPATH, "/single-hop") != NULL;
 }
 
+static bool
+bfd_cli_is_profile(struct vty *vty)
+{
+	return strstr(VTY_CURR_XPATH, "/bfd/profile") != NULL;
+}
+
 /*
  * Functions.
  */
@@ -422,7 +428,7 @@ DEFPY_YANG(
 	NO_STR
 	"Configure echo mode\n")
 {
-	if (!bfd_cli_is_single_hop(vty)) {
+	if (!bfd_cli_is_profile(vty) && !bfd_cli_is_single_hop(vty)) {
 		vty_out(vty, "%% Echo mode is only available for single hop sessions.\n");
 		return CMD_WARNING_CONFIG_FAILED;
 	}
@@ -450,7 +456,7 @@ DEFPY_YANG(
 {
 	char value[32];
 
-	if (!bfd_cli_is_single_hop(vty)) {
+	if (!bfd_cli_is_profile(vty) && !bfd_cli_is_single_hop(vty)) {
 		vty_out(vty, "%% Echo mode is only available for single hop sessions.\n");
 		return CMD_WARNING_CONFIG_FAILED;
 	}