diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 268cc110..4fa10c1e 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -71,7 +71,7 @@ if [ ! -f "${STEPPATH}/config/ca.json" ]; then
     init_if_possible
 fi
 
-if [ ! -f "${PROVISIONER_PWDPATH}" ]; then
+if [ -f "${PWDPATH}" ] && [ ! -f "${PROVISIONER_PWDPATH}" ]; then
     # For backward compatibility,
     # if the --provisioner-password-file doesn't exist,
     # use the same password as the CA.