diff --git a/opnsense/src/etc/inc/plugins.inc.d/defguardgateway.inc b/opnsense/src/etc/inc/plugins.inc.d/defguardgateway.inc
index e15d494d..43a491fa 100644
--- a/opnsense/src/etc/inc/plugins.inc.d/defguardgateway.inc
+++ b/opnsense/src/etc/inc/plugins.inc.d/defguardgateway.inc
@@ -3,6 +3,8 @@ function defguardgateway_services()
 {
     $services = [];
 
+    $pidfile = (string) (new OPNsense\DefguardGateway\DefguardGateway())->general->PidFile;
+
     $services[] = [
         "description" => "Defguard Gateway",
         "configd" => [
@@ -10,8 +12,8 @@ function defguardgateway_services()
             "restart" => ["defguard_gateway restart"],
             "stop" => ["defguard_gateway stop"],
         ],
+        "pidfile" => empty($pidfile) ? "/var/run/defguard_gateway.pid" : $pidfile,
         "name" => "defguard_gateway",
-        "nocheck" => true,
     ];
 
     return $services;
diff --git a/opnsense/src/opnsense/mvc/app/controllers/OPNsense/DefguardGateway/forms/general.xml b/opnsense/src/opnsense/mvc/app/controllers/OPNsense/DefguardGateway/forms/general.xml
index 194655cd..d2e0e761 100644
--- a/opnsense/src/opnsense/mvc/app/controllers/OPNsense/DefguardGateway/forms/general.xml
+++ b/opnsense/src/opnsense/mvc/app/controllers/OPNsense/DefguardGateway/forms/general.xml
@@ -40,8 +40,8 @@
     <id>defguardgateway.general.PidFile</id>
     <label>PID file</label>
     <type>text</type>
-    <hint>Save PID to this file.</hint>
     <help>Optional: write PID to this file.</help>
+    <hint>Default value: /var/run/defguard_gateway.pid</hint>
   </field>
   <field>
     <id>defguardgateway.general.SyslogSocket</id>
diff --git a/opnsense/src/opnsense/mvc/app/models/OPNsense/DefguardGateway/DefguardGateway.xml b/opnsense/src/opnsense/mvc/app/models/OPNsense/DefguardGateway/DefguardGateway.xml
index f09a644c..da480934 100644
--- a/opnsense/src/opnsense/mvc/app/models/OPNsense/DefguardGateway/DefguardGateway.xml
+++ b/opnsense/src/opnsense/mvc/app/models/OPNsense/DefguardGateway/DefguardGateway.xml
@@ -30,6 +30,7 @@
         <Required>Y</Required>
       </UseSyslog>
       <PidFile type="TextField">
+        <default>/var/run/defguard_gateway.pid</default>
         <Required>N</Required>
       </PidFile>
       <SyslogSocket type="TextField">
diff --git a/opnsense/src/opnsense/service/conf/actions.d/actions_defguardgateway.conf b/opnsense/src/opnsense/service/conf/actions.d/actions_defguard_gateway.conf
similarity index 100%
rename from opnsense/src/opnsense/service/conf/actions.d/actions_defguardgateway.conf
rename to opnsense/src/opnsense/service/conf/actions.d/actions_defguard_gateway.conf
diff --git a/opnsense/src/opnsense/service/templates/OPNsense/DefguardGateway/config.toml b/opnsense/src/opnsense/service/templates/OPNsense/DefguardGateway/config.toml
index 20c580dd..c10466fe 100644
--- a/opnsense/src/opnsense/service/templates/OPNsense/DefguardGateway/config.toml
+++ b/opnsense/src/opnsense/service/templates/OPNsense/DefguardGateway/config.toml
@@ -20,9 +20,7 @@ stats_period = {{ OPNsense.defguardgateway.general.StatsPeriod|default(60) }}
 # Required: name of WireGuard interface
 ifname = "{{ OPNsense.defguardgateway.general.IfName|default("wg0") }}"
 # Optional: write PID to this file
-{% if not helpers.empty('OPNsense.defguardgateway.general.PidFile') %}
-pidfile = "{{ OPNsense.defguardgateway.general.PidFile }}"
-{% endif %}
+pidfile = "{{ OPNsense.defguardgateway.general.PidFile|default("/var/run/defguard_gateway.pid") }}"
 # Required: enable logging to syslog
 {% if OPNsense.defguardgateway.general.UseSyslog == "1" %}
 use_syslog = true