diff --git a/zebra/zebra_evpn_mh.c b/zebra/zebra_evpn_mh.c
index ca29e3a991..6c4e8b99f7 100644
--- a/zebra/zebra_evpn_mh.c
+++ b/zebra/zebra_evpn_mh.c
@@ -3286,7 +3286,7 @@ DEFPY_HIDDEN(zebra_evpn_es_bypass, zebra_evpn_es_bypass_cmd,
 	} else {
 		if (!zebra_evpn_is_if_es_capable(zif)) {
 			vty_out(vty,
-				"%%DF bypass cannot be associated with this interface type\n");
+				"%% DF bypass cannot be associated with this interface type\n");
 			return CMD_WARNING;
 		}
 		zebra_evpn_es_bypass_cfg_update(zif, true);
@@ -3311,7 +3311,7 @@ DEFPY(zebra_evpn_es_pref, zebra_evpn_es_pref_cmd,
 	} else {
 		if (!zebra_evpn_is_if_es_capable(zif)) {
 			vty_out(vty,
-				"%%DF preference cannot be associated with this interface type\n");
+				"%% DF preference cannot be associated with this interface type\n");
 			return CMD_WARNING;
 		}
 		zebra_evpn_es_df_pref_update(zif, df_pref);
@@ -3341,25 +3341,26 @@ DEFPY(zebra_evpn_es_sys_mac,
 
 		ret = zebra_evpn_es_sys_mac_update(zif, &zero_mac);
 		if (ret == -1) {
-			vty_out(vty, "%%Failed to clear ES sysmac\n");
+			vty_out(vty, "%% Failed to clear ES sysmac\n");
 			return CMD_WARNING;
 		}
 	} else {
 
 		if (!zebra_evpn_is_if_es_capable(zif)) {
 			vty_out(vty,
-				"%%ESI cannot be associated with this interface type\n");
+				"%% ESI cannot be associated with this interface type\n");
 			return CMD_WARNING;
 		}
 
 		if  (!mac || is_zero_mac(&mac->eth_addr)) {
-			vty_out(vty, "%%ES sysmac value is invalid\n");
+			vty_out(vty, "%% ES sysmac value is invalid\n");
 			return CMD_WARNING;
 		}
 
 		ret = zebra_evpn_es_sys_mac_update(zif, &mac->eth_addr);
 		if (ret == -1) {
-			vty_out(vty, "%%ESI already exists on a different interface\n");
+			vty_out(vty,
+				"%% ESI already exists on a different interface\n");
 			return CMD_WARNING;
 		}
 	}
@@ -3399,7 +3400,7 @@ DEFPY(zebra_evpn_es_id,
 	} else {
 		if (!zebra_evpn_is_if_es_capable(zif)) {
 			vty_out(vty,
-				"%%ESI cannot be associated with this interface type\n");
+				"%% ESI cannot be associated with this interface type\n");
 			return CMD_WARNING;
 		}
 
@@ -3420,7 +3421,7 @@ DEFPY(zebra_evpn_es_id,
 
 		if (ret == -1) {
 			vty_out(vty,
-					"%%ESI already exists on a different interface\n");
+				"%% ESI already exists on a different interface\n");
 			return CMD_WARNING;
 		}
 	}