diff --git a/22/apache/entrypoint.sh b/22/apache/entrypoint.sh
index 6c8f35f4..309524f6 100755
--- a/22/apache/entrypoint.sh
+++ b/22/apache/entrypoint.sh
@@ -103,12 +103,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
 
         # If another process is syncing the html folder, wait for
-        # it to be done, then escape initalization
+        # it to be done, then escape initalization.
+        # You need to define the NEXTCLOUD_INIT_LOCK environment variable
         lock=/var/www/html/nextcloud-init-sync.lock
         count=0
         limit=10
 
-        if [ -f "$lock" ]; then
+        if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
             until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
             do
                 count=$((count+1))
diff --git a/22/fpm-alpine/entrypoint.sh b/22/fpm-alpine/entrypoint.sh
index 6c8f35f4..309524f6 100755
--- a/22/fpm-alpine/entrypoint.sh
+++ b/22/fpm-alpine/entrypoint.sh
@@ -103,12 +103,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
 
         # If another process is syncing the html folder, wait for
-        # it to be done, then escape initalization
+        # it to be done, then escape initalization.
+        # You need to define the NEXTCLOUD_INIT_LOCK environment variable
         lock=/var/www/html/nextcloud-init-sync.lock
         count=0
         limit=10
 
-        if [ -f "$lock" ]; then
+        if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
             until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
             do
                 count=$((count+1))
diff --git a/22/fpm/entrypoint.sh b/22/fpm/entrypoint.sh
index 6c8f35f4..309524f6 100755
--- a/22/fpm/entrypoint.sh
+++ b/22/fpm/entrypoint.sh
@@ -103,12 +103,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
 
         # If another process is syncing the html folder, wait for
-        # it to be done, then escape initalization
+        # it to be done, then escape initalization.
+        # You need to define the NEXTCLOUD_INIT_LOCK environment variable
         lock=/var/www/html/nextcloud-init-sync.lock
         count=0
         limit=10
 
-        if [ -f "$lock" ]; then
+        if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
             until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
             do
                 count=$((count+1))
diff --git a/23/apache/entrypoint.sh b/23/apache/entrypoint.sh
index 6c8f35f4..309524f6 100755
--- a/23/apache/entrypoint.sh
+++ b/23/apache/entrypoint.sh
@@ -103,12 +103,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
 
         # If another process is syncing the html folder, wait for
-        # it to be done, then escape initalization
+        # it to be done, then escape initalization.
+        # You need to define the NEXTCLOUD_INIT_LOCK environment variable
         lock=/var/www/html/nextcloud-init-sync.lock
         count=0
         limit=10
 
-        if [ -f "$lock" ]; then
+        if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
             until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
             do
                 count=$((count+1))
diff --git a/23/fpm-alpine/entrypoint.sh b/23/fpm-alpine/entrypoint.sh
index 6c8f35f4..309524f6 100755
--- a/23/fpm-alpine/entrypoint.sh
+++ b/23/fpm-alpine/entrypoint.sh
@@ -103,12 +103,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
 
         # If another process is syncing the html folder, wait for
-        # it to be done, then escape initalization
+        # it to be done, then escape initalization.
+        # You need to define the NEXTCLOUD_INIT_LOCK environment variable
         lock=/var/www/html/nextcloud-init-sync.lock
         count=0
         limit=10
 
-        if [ -f "$lock" ]; then
+        if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
             until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
             do
                 count=$((count+1))
diff --git a/23/fpm/entrypoint.sh b/23/fpm/entrypoint.sh
index 6c8f35f4..309524f6 100755
--- a/23/fpm/entrypoint.sh
+++ b/23/fpm/entrypoint.sh
@@ -103,12 +103,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
 
         # If another process is syncing the html folder, wait for
-        # it to be done, then escape initalization
+        # it to be done, then escape initalization.
+        # You need to define the NEXTCLOUD_INIT_LOCK environment variable
         lock=/var/www/html/nextcloud-init-sync.lock
         count=0
         limit=10
 
-        if [ -f "$lock" ]; then
+        if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
             until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
             do
                 count=$((count+1))
diff --git a/24/apache/entrypoint.sh b/24/apache/entrypoint.sh
index 6c8f35f4..309524f6 100755
--- a/24/apache/entrypoint.sh
+++ b/24/apache/entrypoint.sh
@@ -103,12 +103,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
 
         # If another process is syncing the html folder, wait for
-        # it to be done, then escape initalization
+        # it to be done, then escape initalization.
+        # You need to define the NEXTCLOUD_INIT_LOCK environment variable
         lock=/var/www/html/nextcloud-init-sync.lock
         count=0
         limit=10
 
-        if [ -f "$lock" ]; then
+        if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
             until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
             do
                 count=$((count+1))
diff --git a/24/fpm-alpine/entrypoint.sh b/24/fpm-alpine/entrypoint.sh
index 6c8f35f4..309524f6 100755
--- a/24/fpm-alpine/entrypoint.sh
+++ b/24/fpm-alpine/entrypoint.sh
@@ -103,12 +103,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
 
         # If another process is syncing the html folder, wait for
-        # it to be done, then escape initalization
+        # it to be done, then escape initalization.
+        # You need to define the NEXTCLOUD_INIT_LOCK environment variable
         lock=/var/www/html/nextcloud-init-sync.lock
         count=0
         limit=10
 
-        if [ -f "$lock" ]; then
+        if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
             until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
             do
                 count=$((count+1))
diff --git a/24/fpm/entrypoint.sh b/24/fpm/entrypoint.sh
index 6c8f35f4..309524f6 100755
--- a/24/fpm/entrypoint.sh
+++ b/24/fpm/entrypoint.sh
@@ -103,12 +103,13 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
         fi
 
         # If another process is syncing the html folder, wait for
-        # it to be done, then escape initalization
+        # it to be done, then escape initalization.
+        # You need to define the NEXTCLOUD_INIT_LOCK environment variable
         lock=/var/www/html/nextcloud-init-sync.lock
         count=0
         limit=10
 
-        if [ -f "$lock" ]; then
+        if [ -f "$lock" ] && [ -n "${NEXTCLOUD_INIT_LOCK+x}" ]; then
             until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ]
             do
                 count=$((count+1))