diff --git a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
index f4e325fb3..6ec495e3a 100644
--- a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
+++ b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/ospfd.conf
@@ -1,6 +1,7 @@
 {% macro cline(directive, modelname) -%}{% if modelname %}
   ip ospf {{ directive }} {{ modelname }}
 {% endif %}{%- endmacro %}
+{% if helpers.exists('OPNsense.quagga.ospf.enabled') and OPNsense.quagga.ospf.enabled == '1' %}
 !
 ! Zebra configuration saved from vty
 !   2017/03/03 20:21:04
@@ -47,3 +48,4 @@ router ospf
 !
 line vty
 !
+{% endif %}
diff --git a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/ripd.conf b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/ripd.conf
index 38f4df1db..504bd2028 100644
--- a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/ripd.conf
+++ b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/ripd.conf
@@ -1,3 +1,4 @@
+{% if helpers.exists('OPNsense.quagga.rip.enabled') and OPNsense.quagga.rip.enabled == '1' %}
 !
 ! Zebra configuration saved from vty
 !   2017/03/26 22:40:16
@@ -24,3 +25,4 @@ router rip
 !
 line vty
 !
+{% endif %}