diff --git a/setup/start.sh b/setup/start.sh
index 4a39df48..9d19a411 100755
--- a/setup/start.sh
+++ b/setup/start.sh
@@ -127,9 +127,6 @@ management/ssl_certificates.py -q
 # If there aren't any mail users yet, create one.
 source setup/firstuser.sh
 
-#Setup Blocklist
-source setup/blacklist.sh
-
 # Done.
 echo
 echo "-----------------------------------------------"
diff --git a/setup/system.sh b/setup/system.sh
index cc152524..0c3654b7 100755
--- a/setup/system.sh
+++ b/setup/system.sh
@@ -245,6 +245,10 @@ if [ -z "$DISABLE_FIREWALL" ]; then
 	fi
 
 	ufw --force enable;
+	
+	#Setup Blocklist
+	source setup/blacklist.sh
+	
 fi #NODOC
 
 # ### Local DNS Service