diff --git a/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf b/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf
index 86170cd9b..bfdeb6197 100644
--- a/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf
+++ b/net/frr/src/opnsense/service/conf/actions.d/actions_quagga.conf
@@ -156,6 +156,13 @@ errors:no
type:script_output
message:FRR diagnostics "show bfd peers counters %s"
+[diagnostics.bfd_staticroute]
+command:/usr/local/bin/vtysh
+parameters: -c 'show bfd static route %s'
+errors:no
+type:script_output
+message:FRR diagnostics "show bfd route %s"
+
[diagnostics.ospf_database]
command:/usr/local/bin/vtysh
parameters: -c 'show ip ospf database %s'
diff --git a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/staticd.conf b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/staticd.conf
index 43a810beb..59153f6c1 100644
--- a/net/frr/src/opnsense/service/templates/OPNsense/Quagga/staticd.conf
+++ b/net/frr/src/opnsense/service/templates/OPNsense/Quagga/staticd.conf
@@ -13,6 +13,9 @@ ip
{%- endif %}
{%- if route.interfacename %}
{{ helpers.physical_interface(route.interfacename) }}
+{%- endif %}
+{%- if 'bfd' in route and route.bfd == '1' %}
+ bfd
{%- endif +%}
{% endif %}
{% endfor %}