diff --git a/overlay/bin/molecule b/overlay/bin/molecule
index 8d77d26..9284dc7 100755
--- a/overlay/bin/molecule
+++ b/overlay/bin/molecule
@@ -25,6 +25,7 @@ fi
 if [ -n "${MOLECULE_ANSIBLE_VAULT_PASSWORD}" ]; then
     MOLECULE_ANSIBLE_VAULT_PASSWORD_FILE=/root/.vaultpasswd
     echo "${MOLECULE_ANSIBLE_VAULT_PASSWORD}" > $MOLECULE_ANSIBLE_VAULT_PASSWORD_FILE
+    exec env ANSIBLE_VAULT_PASSWORD_FILE=$MOLECULE_ANSIBLE_VAULT_PASSWORD_FILE /usr/local/bin/molecule "$@"
+else
+    exec /usr/local/bin/molecule "$@"
 fi
-
-exec env ANSIBLE_VAULT_PASSWORD_FILE=$MOLECULE_ANSIBLE_VAULT_PASSWORD_FILE /usr/local/bin/molecule "$@"