diff --git a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
index b0eb8e6f2..34a498297 100755
--- a/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
+++ b/paperless_ngx/rootfs/etc/cont-init.d/99-run.sh
@@ -2,14 +2,6 @@
 # shellcheck shell=bash
 # shellcheck disable=SC2155
 
-####################
-# Define defaults #
-####################
-
-DEFAULT_PAPERLESS_DATA_DIR="/config/addons_config/paperless_ng"
-DEFAULT_PAPERLESS_MEDIA_ROOT="/config/addons_config/paperless_ng/media"
-DEFAULT_PAPERLESS_CONSUMPTION_DIR="/config/addons_config/paperless_ng/consume"
-
 ####################
 # Define variables #
 ####################
@@ -26,14 +18,18 @@ if bashio::config.has_value "OCRLANG"; then
 fi
 if bashio::config.has_value "PAPERLESS_OCR_MODE"; then export PAPERLESS_OCR_MODE=$(bashio::config "PAPERLESS_OCR_MODE"); fi
 
-if bashio::config.has_value "PAPERLESS_DATA_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_DATA_DIR"); else export $DEFAULT_PAPERLESS_DATA_DIR ; fi
-if bashio::config.has_value "PAPERLESS_MEDIA_ROOT"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_MEDIA_ROOT"); else export $DEFAULT_PAPERLESS_MEDIA_ROOT ; fi
-if bashio::config.has_value "PAPERLESS_CONSUMPTION_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_CONSUMPTION_DIR"); else export $DEFAULT_PAPERLESS_CONSUMPTION_DIR ; fi
-
 export PAPERLESS_ADMIN_PASSWORD="admin"
 export PAPERLESS_ADMIN_USER="admin"
 export PAPERLESS_ALLOWED_HOSTS="*"
 
+export PAPERLESS_DATA_DIR="/config/addons_config/paperless_ng"
+export PAPERLESS_MEDIA_ROOT="/config/addons_config/paperless_ng/media"
+export PAPERLESS_CONSUMPTION_DIR="/config/addons_config/paperless_ng/consume"
+
+if bashio::config.has_value "PAPERLESS_DATA_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_DATA_DIR"); fi
+if bashio::config.has_value "PAPERLESS_MEDIA_ROOT"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_MEDIA_ROOT"); fi
+if bashio::config.has_value "PAPERLESS_CONSUMPTION_DIR"; then export PAPERLESS_URL=$(bashio::config "PAPERLESS_CONSUMPTION_DIR"); fi
+
 ###################
 # Define database #
 ###################