diff --git a/webtrees/rootfs/etc/cont-init.d/99-run.sh b/webtrees/rootfs/etc/cont-init.d/99-run.sh
index 8a7d8bfde..f6345bf10 100644
--- a/webtrees/rootfs/etc/cont-init.d/99-run.sh
+++ b/webtrees/rootfs/etc/cont-init.d/99-run.sh
@@ -118,6 +118,20 @@ if [ -f "$WEBTREES_HOME"/data/config.ini.php ]; then
     sed -i "$LINE d" "$WEBTREES_HOME"/data/config.ini.php
 fi || true
 
+###################
+# TRUSTED HEADERS #
+###################
+
+if bashio::config.has_value "trusted_headers" && [ -f "$WEBTREES_HOME"/data/config.ini.php ]; then
+    bashio::log.info "Aligning trusted_headers addon config (use single address, or a range of addresses in CIDR format)"
+    sed -i "/trusted_headers/ d" "$WEBTREES_HOME" /data/config.ini.php
+    sed -i "1a trusted_headers=\"$(bashio::config 'trusted_headers')\""/data/config.ini.php
+elif [ -f "$WEBTREES_HOME"/data/config.ini.php ]; then
+    bashio::log.info "Aligning trusted_headers addon config with cf-connecting-ip"
+    sed -i "/trusted_headers/ d" "$WEBTREES_HOME" /data/config.ini.php
+    sed -i "1a trusted_headers=\"cf-connecting-ip\"" /data/config.ini.php
+fi
+
 ############
 # END INFO #
 ############