diff --git a/webtrees/rootfs/etc/cont-init.d/99-run.sh b/webtrees/rootfs/etc/cont-init.d/99-run.sh
index 01e4d74f4..3b11f8d45 100644
--- a/webtrees/rootfs/etc/cont-init.d/99-run.sh
+++ b/webtrees/rootfs/etc/cont-init.d/99-run.sh
@@ -9,6 +9,13 @@
 export BASE_URL=$(bashio::config 'BASE_URL'):$(bashio::addon.port 80)
 #export LANG=$(bashio::config 'LANG')
 
+##############
+# CLOUDFLARE #
+##############
+
+if bashio::config.true "base_url_portless"; then
+  export BASE_URL=$(bashio::config 'BASE_URL')
+fi
 
 ###################
 # Define database #