diff --git a/sysutils/puppet-agent/pkg-descr b/sysutils/puppet-agent/pkg-descr
index 2fbad135e..1581f039f 100644
--- a/sysutils/puppet-agent/pkg-descr
+++ b/sysutils/puppet-agent/pkg-descr
@@ -15,6 +15,7 @@ Added:
 
 Changed:
 * add default values for Puppet Server + Environment
+* don't wipe puppet.conf if service is disabled
 
 1.0
 
diff --git a/sysutils/puppet-agent/src/opnsense/service/templates/OPNsense/PuppetAgent/puppetagent.conf b/sysutils/puppet-agent/src/opnsense/service/templates/OPNsense/PuppetAgent/puppetagent.conf
index 51e6fa915..dc3a3649d 100644
--- a/sysutils/puppet-agent/src/opnsense/service/templates/OPNsense/PuppetAgent/puppetagent.conf
+++ b/sysutils/puppet-agent/src/opnsense/service/templates/OPNsense/PuppetAgent/puppetagent.conf
@@ -1,21 +1,20 @@
-{% if helpers.exists('OPNsense.puppetagent.general') and OPNsense.puppetagent.general.Enabled|default("0") == "1" %}
 [main]
-certname = {{ system.hostname|lower }}.{{ system.domain|lower }}
-server = {{ OPNsense.puppetagent.general.FQDN|default("") }}
-logdest = /var/log/puppet-agent.log
+  certname = {{ system.hostname|lower }}.{{ system.domain|lower }}
+  logdest = /var/log/puppet-agent.log
 {% if OPNsense.puppetagent.general.RunInterval|default("") != "" %}
-runinterval = {{ OPNsense.puppetagent.general.RunInterval }}
+  runinterval = {{ OPNsense.puppetagent.general.RunInterval }}
 {% endif %}
 {% if OPNsense.puppetagent.general.RunTimeout|default("") != "" %}
-runtimeout = {{ OPNsense.puppetagent.general.RunTimeout}}
+  runtimeout = {{ OPNsense.puppetagent.general.RunTimeout}}
 {% endif %}
+  server = {{ OPNsense.puppetagent.general.FQDN|default("") }}
 {% if OPNsense.puppetagent.general.UseCacheOnFailure|default("0") == "1" %}
-usecacheonfailure = true
+  usecacheonfailure = true
 {% else %}
-usecacheonfailure = false
+  usecacheonfailure = false
 {% endif %}
-{% if helpers.exists('OPNsense.puppetagent.general') and not helpers.empty('OPNsense.puppetagent.general.Environment') %}
+
 [agent]
-environment = {{ OPNsense.puppetagent.general.Environment|default("") }}
-{% endif %}
+{% if not helpers.empty('OPNsense.puppetagent.general.Environment') %}
+  environment = {{ OPNsense.puppetagent.general.Environment|default("") }}
 {% endif %}