diff --git a/scripts/stack/run-stack.sh b/scripts/stack/run-stack.sh
index 4838812f6..0876c136d 100755
--- a/scripts/stack/run-stack.sh
+++ b/scripts/stack/run-stack.sh
@@ -41,10 +41,10 @@ if [[ "${connectors_only}" != true ]]; then
   source $CURDIR/wait-for-elasticsearch.sh
 
   # Start Kibana
+  source $CURDIR/update-kibana-user-password.sh
   echo "Starting Kibana..."
   docker-compose -f $compose_file up --detach kibana
   source $CURDIR/wait-for-kibana.sh
-  source $CURDIR/update-kibana-user-password.sh
 fi
 
 source ./copy-config.sh
diff --git a/scripts/stack/update-kibana-user-password.sh b/scripts/stack/update-kibana-user-password.sh
index a81be356e..7143b2eed 100644
--- a/scripts/stack/update-kibana-user-password.sh
+++ b/scripts/stack/update-kibana-user-password.sh
@@ -11,10 +11,6 @@ if [[ ${CURDIR:-} == "" ]]; then
     export CURDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 fi
 
-if [[ "${ELASTIC_PASSWORD:-}" == "" ]]; then
-    source $CURDIR/read-env.sh $CURDIR/.env
-fi
-
 echo "Updating Kibana password in Elasticsearch running on $ELASTICSEARCH_URL"
 change_data="{ \"password\": \"${ELASTIC_PASSWORD}\" }"
 curl -u elastic:$ELASTIC_PASSWORD "$@" -X POST "${ELASTICSEARCH_URL}/_security/user/kibana_system/_password?pretty" -H 'Content-Type: application/json' -d"${change_data}"