diff --git a/general/package/zerotier-one/files/S90zerotier b/general/package/zerotier-one/files/S90zerotier
index 60bcaada..d1f21292 100755
--- a/general/package/zerotier-one/files/S90zerotier
+++ b/general/package/zerotier-one/files/S90zerotier
@@ -3,22 +3,28 @@
 # Start zerotier-one
 #
 
+config_file=/etc/webui/zerotier.conf
+[ ! -f "$config_file" ] && echo "Config file not found." && exit 2
+source $config_file
+
 case "$1" in
-  start)
-	if grep -q daemon=1 /etc/zerotier.conf; then
-	    echo "Starting zerotier-one daemon..."
-	    /sbin/modprobe tun
-	    /usr/sbin/zerotier-one -d
-	else
-	    echo "Zerotier-One service disabled in zerotier.conf..."
-	fi
-    ;;
-  stop)
-	echo "Stopping zerotier-one daemon..."
-	kill -9 $(pidof zerotier-one)
-	/sbin/rmmod -w tun
-    ;;
-    *)
-	echo "Usage: $0 {start|stop}"
-	exit 1
+	start)
+		if [ "true" = "$zerotier_enabled" ]; then
+			echo "Starting zerotier-one daemon..."
+			/sbin/modprobe tun
+			/usr/sbin/zerotier-one -d
+		else
+			echo "Zerotier-One service is disabled in ${config_file}."
+			exit 3
+		fi
+		;;
+	stop)
+		echo "Stopping zerotier-one daemon..."
+		kill -9 $(pidof zerotier-one)
+		/sbin/rmmod -w tun
+		;;
+	*)
+		echo "Usage: $0 {start|stop}"
+		exit 1
+		;;
 esac
diff --git a/general/package/zerotier-one/files/zerotier.conf b/general/package/zerotier-one/files/zerotier.conf
deleted file mode 100644
index 0bc970a2..00000000
--- a/general/package/zerotier-one/files/zerotier.conf
+++ /dev/null
@@ -1 +0,0 @@
-daemon=0
diff --git a/general/package/zerotier-one/zerotier-one.mk b/general/package/zerotier-one/zerotier-one.mk
index 6dce4f5d..a7da87f1 100644
--- a/general/package/zerotier-one/zerotier-one.mk
+++ b/general/package/zerotier-one/zerotier-one.mk
@@ -20,9 +20,6 @@ endef
 define ZEROTIER_ONE_INSTALL_TARGET_CMDS
 	$(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install
 
-	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc
-	cp ../general/package/zerotier-one/files/zerotier.conf $(TARGET_DIR)/etc
-
 	$(INSTALL) -m 755 -d $(TARGET_DIR)/etc/init.d
 	cp ../general/package/zerotier-one/files/S90zerotier $(TARGET_DIR)/etc/init.d
 endef