diff --git a/docker/1.5-openssl/docker-entrypoint.sh b/docker/1.5-openssl/docker-entrypoint.sh
index 378d91ec..583f67c9 100755
--- a/docker/1.5-openssl/docker-entrypoint.sh
+++ b/docker/1.5-openssl/docker-entrypoint.sh
@@ -4,7 +4,7 @@ set -e
 # Set permissions
 user="$(id -u)"
 if [ "$user" = '0' ]; then
-	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto
+	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto || true
 fi
 
 exec "$@"
diff --git a/docker/1.5/docker-entrypoint.sh b/docker/1.5/docker-entrypoint.sh
index 378d91ec..583f67c9 100755
--- a/docker/1.5/docker-entrypoint.sh
+++ b/docker/1.5/docker-entrypoint.sh
@@ -4,7 +4,7 @@ set -e
 # Set permissions
 user="$(id -u)"
 if [ "$user" = '0' ]; then
-	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto
+	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto || true
 fi
 
 exec "$@"
diff --git a/docker/1.6-openssl/docker-entrypoint.sh b/docker/1.6-openssl/docker-entrypoint.sh
index 378d91ec..583f67c9 100755
--- a/docker/1.6-openssl/docker-entrypoint.sh
+++ b/docker/1.6-openssl/docker-entrypoint.sh
@@ -4,7 +4,7 @@ set -e
 # Set permissions
 user="$(id -u)"
 if [ "$user" = '0' ]; then
-	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto
+	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto || true
 fi
 
 exec "$@"
diff --git a/docker/1.6/docker-entrypoint.sh b/docker/1.6/docker-entrypoint.sh
index 378d91ec..583f67c9 100755
--- a/docker/1.6/docker-entrypoint.sh
+++ b/docker/1.6/docker-entrypoint.sh
@@ -4,7 +4,7 @@ set -e
 # Set permissions
 user="$(id -u)"
 if [ "$user" = '0' ]; then
-	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto
+	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto || true
 fi
 
 exec "$@"
diff --git a/docker/generic/docker-entrypoint.sh b/docker/generic/docker-entrypoint.sh
index 85099f54..583f67c9 100755
--- a/docker/generic/docker-entrypoint.sh
+++ b/docker/generic/docker-entrypoint.sh
@@ -1,15 +1,10 @@
 #!/bin/ash
 set -e
 
-docker_set_permissions() {
-	local user; user="$(id -u)"
-
-	if [ "$user" = '0' ]; then
-		chown -R mosquitto:mosquitto /mosquitto
-	fi
-}
-
-
-docker_set_permissions()
+# Set permissions
+user="$(id -u)"
+if [ "$user" = '0' ]; then
+	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto || true
+fi
 
 exec "$@"
diff --git a/docker/local/docker-entrypoint.sh b/docker/local/docker-entrypoint.sh
index 85099f54..583f67c9 100755
--- a/docker/local/docker-entrypoint.sh
+++ b/docker/local/docker-entrypoint.sh
@@ -1,15 +1,10 @@
 #!/bin/ash
 set -e
 
-docker_set_permissions() {
-	local user; user="$(id -u)"
-
-	if [ "$user" = '0' ]; then
-		chown -R mosquitto:mosquitto /mosquitto
-	fi
-}
-
-
-docker_set_permissions()
+# Set permissions
+user="$(id -u)"
+if [ "$user" = '0' ]; then
+	[ -d "/mosquitto" ] && chown -R mosquitto:mosquitto /mosquitto || true
+fi
 
 exec "$@"