diff --git a/src/freedombone-installer b/src/freedombone-installer
index 2773e4260994df2b9c886ec2fc0fc7a4f4edd245..b11cf866ed81bf6d26876aab998d50610815b74e 100755
--- a/src/freedombone-installer
+++ b/src/freedombone-installer
@@ -1211,7 +1211,8 @@ function regenerate_blocklist {
     webadmin_install_dir="/var/www/${local_hostname}/htdocs/admin"
     if [ -f "$webadmin_install_dir/blocking_template.html" ]; then
         cp "$webadmin_install_dir/blocking_template.html" "$webadmin_install_dir/blocking.html"
-        blockedlist=$(cat "$FIREWALL_DOMAINS")
+        blockedlist=$(sed 's@[/\&]@\\&@g;s/$/\\/' "$FIREWALL_DOMAINS"; echo .)
+        replacement=${replacement%.}
         sed -i "s|BLOCKEDLIST|$blockedlist|g" "$webadmin_install_dir/blocking.html"
         chown www-data:www-data "$webadmin_install_dir/blocking.html"
     fi
diff --git a/src/freedombone-utils-firewall b/src/freedombone-utils-firewall
index ae052f58e1dda972e4f0985d47676947996f9579..f5eb559415fe806cf48504874ee30f5152fac282 100755
--- a/src/freedombone-utils-firewall
+++ b/src/freedombone-utils-firewall
@@ -733,7 +733,8 @@ function regenerate_webadmin_blocklist {
     webadmin_install_dir="/var/www/${local_hostname}/htdocs/admin"
     if [ -f "$webadmin_install_dir/blocking_template.html" ]; then
         cp "$webadmin_install_dir/blocking_template.html" "$webadmin_install_dir/blocking.html"
-        blockedlist=$(cat "$FIREWALL_DOMAINS")
+        blockedlist=$(sed 's@[/\&]@\\&@g;s/$/\\/' "$FIREWALL_DOMAINS"; echo .)
+        replacement=${replacement%.}
         sed -i "s|BLOCKEDLIST|$blockedlist|g" "$webadmin_install_dir/blocking.html"
         chown www-data:www-data "$webadmin_install_dir/blocking.html"
     fi