diff --git a/root/defaults/blocklist-update.sh b/root/defaults/blocklist-update.sh
index e3263df..c76c868 100644
--- a/root/defaults/blocklist-update.sh
+++ b/root/defaults/blocklist-update.sh
@@ -1,10 +1,20 @@
 #!/usr/bin/with-contenv bash
 
-BLOCKLIST_URL=`jq -r '.["blocklist-url"]' settings.json`
+BLOCKLIST_ENABLED=`jq -r '.["blocklist-enabled"]' /config/settings.json`
+BLOCKLIST_URL=`jq -r '.["blocklist-url"]' /config/settings.json | sed 's/\&/\&/g'`
 
-rm /config/blocklists/*
-cd /config/blocklists
-wget -q $BLOCKLIST_URL
-gunzip *.gz
-chmod go+r *
-s6-svc -h /var/run/s6/services/transmission
+if [ $BLOCKLIST_ENABLED == true ]; then
+	mkdir -p /tmp/blocklists
+	rm -rf /tmp/blocklists/*
+	cd /tmp/blocklists
+	wget -q -O blocklist.gz "$BLOCKLIST_URL"
+	if [ $? == 0 ]; then
+		gunzip *.gz
+		if [ $? == 0 ]; then
+			chmod go+r *
+			rm -rf /config/blocklists/*
+			cp /tmp/blocklists/* /config/blocklists
+			s6-svc -h /var/run/s6/services/transmission
+		fi
+	fi
+fi