diff --git a/scripts/start-autostop b/scripts/start-autostop
index c610fd7d495..f4ca6dd56e6 100755
--- a/scripts/start-autostop
+++ b/scripts/start-autostop
@@ -4,13 +4,11 @@
 . "$(dirname "$0")/start-utils"
 
 : "${SERVER_PORT:=25565}"
-: "${ENABLE_AUTOSTOP:=false}"
 : "${AUTOSTOP_TIMEOUT_EST:=3600}"
 : "${AUTOSTOP_TIMEOUT_INIT:=1800}"
 : "${AUTOSTOP_PERIOD:=10}"
 : "${DEBUG_AUTOSTOP:=false}"
 export SERVER_PORT
-export ENABLE_AUTOSTOP
 export AUTOSTOP_TIMEOUT_EST
 export AUTOSTOP_TIMEOUT_INIT
 export AUTOSTOP_PERIOD
@@ -25,4 +23,4 @@ checkIfNotZeroElseSetToDefault "AUTOSTOP_PERIOD" 10
 isNumericElseSetToDefault "AUTOSTOP_TIMEOUT_EST" 3600
 isNumericElseSetToDefault "AUTOSTOP_TIMEOUT_INIT" 1800
 
-/auto/autostop-daemon.sh &
+"$(dirname "$0")/auto/autostop-daemon.sh" &
diff --git a/scripts/start-configuration b/scripts/start-configuration
index aa360867bce..71b25a00e2d 100755
--- a/scripts/start-configuration
+++ b/scripts/start-configuration
@@ -167,9 +167,7 @@ fi
 
 if isTrue "${ENABLE_AUTOPAUSE}"; then
   "$(dirname "$0")/start-autopause"
-fi
-
-if isTrue "${ENABLE_AUTOSTOP}"; then
+elif isTrue "${ENABLE_AUTOSTOP}"; then
   "$(dirname "$0")/start-autostop"
 fi