diff --git a/net/tinc/src/etc/inc/plugins.inc.d/if_tinc.inc b/net/tinc/src/etc/inc/plugins.inc.d/if_tinc.inc
index 46039fd6e..e52d4abde 100644
--- a/net/tinc/src/etc/inc/plugins.inc.d/if_tinc.inc
+++ b/net/tinc/src/etc/inc/plugins.inc.d/if_tinc.inc
@@ -44,20 +44,18 @@ function if_tinc_services()
 
     $services = array();
     $is_enabled = false;
-    if (isset($config['OPNsense']['proxy']['general']['enabled']) && $config['OPNsense']['proxy']['general']['enabled'] == 1) {
-      if (isset($config['OPNsense']['Tinc']['networks']['network'])) {
-          if (!isset($config['OPNsense']['Tinc']['networks']['network'][0])) {
-              $networks = array($config['OPNsense']['Tinc']['networks']['network']);
-          } else {
-              $networks = $config['OPNsense']['Tinc']['networks']['network'];
-          }
-          foreach ($networks as $network) {
-              if (!empty($network['enabled'])) {
-                  $is_enabled = true;
-                  break;
-              }
-          }
-      }
+    if (isset($config['OPNsense']['Tinc']['networks']['network'])) {
+        if (!isset($config['OPNsense']['Tinc']['networks']['network'][0])) {
+            $networks = array($config['OPNsense']['Tinc']['networks']['network']);
+        } else {
+            $networks = $config['OPNsense']['Tinc']['networks']['network'];
+        }
+        foreach ($networks as $network) {
+            if (!empty($network['enabled'])) {
+                $is_enabled = true;
+                break;
+            }
+        }
     }
 
     if ($is_enabled) {
diff --git a/net/tinc/src/etc/rc.d/opnsense-tincd b/net/tinc/src/etc/rc.d/opnsense-tincd
index 1e3362ce4..5f7b0a439 100755
--- a/net/tinc/src/etc/rc.d/opnsense-tincd
+++ b/net/tinc/src/etc/rc.d/opnsense-tincd
@@ -13,6 +13,9 @@ name=opnsense-tincd
 
 stop_cmd=tincd_stop
 start_cmd=tincd_start
+rcvar=OPNtincd_enable
+
+[ -z "$OPNtincd_enable" ] && OPNtincd_enable="NO"
 
 # stop tincd
 tincd_stop()