diff --git a/src/opnsense/service/templates/OPNsense/IDS/rc.conf.d b/src/opnsense/service/templates/OPNsense/IDS/rc.conf.d
index 2598588f1..837bd3a00 100644
--- a/src/opnsense/service/templates/OPNsense/IDS/rc.conf.d
+++ b/src/opnsense/service/templates/OPNsense/IDS/rc.conf.d
@@ -2,6 +2,7 @@
 {% from 'OPNsense/Macros/interface.macro' import physical_interface %}
 {% if helpers.exists('OPNsense.IDS.general') and OPNsense.IDS.general.enabled|default("0") == "1" %}
 suricata_enable="YES"
+suricata_opnsense_bootup_run="/usr/local/opnsense/scripts/suricata/setup.sh"
 
 {% if OPNsense.IDS.general.ips|default("0") == "1" %}
 # IPS mode, switch to netmap
@@ -31,5 +32,3 @@ suricata_flags="-D {%
 {% else %}
 suricata_enable="NO"
 {% endif %}
-
-suricata_opnsense_bootup_run="/usr/local/opnsense/scripts/suricata/setup.sh"
diff --git a/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d b/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d
index 079fa7df6..c0f4215d5 100644
--- a/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d
+++ b/src/opnsense/service/templates/OPNsense/Proxy/rc.conf.d
@@ -1,3 +1,6 @@
-squid_enable={% if helpers.exists('OPNsense.proxy.general.enabled') and OPNsense.proxy.general.enabled|default("0") == "1" %}YES{% else %}NO{% endif %}
-
+{% if helpers.exists('OPNsense.proxy.general.enabled') and OPNsense.proxy.general.enabled|default("0") == "1" %}
+squid_enable=YES
 squid_opnsense_bootup_run="/usr/local/opnsense/scripts/proxy/setup.sh"
+{% else %}
+squid_enable=NO
+{% endif %}