diff --git a/pica-etherpad/entrypoint.sh b/pica-etherpad/entrypoint.sh
index d1fda49a0871658d79193f5640c51cb7dfb7a5c8..b2772009bf9f5c5e2c96ffc0a547119c079060d9 100644
--- a/pica-etherpad/entrypoint.sh
+++ b/pica-etherpad/entrypoint.sh
@@ -22,7 +22,7 @@ if [ -z "${DB_HOST}" ]; then
 	exit 1
 fi
 
-while ! { mysqladmin ping -u${DB_USER} -p${DB_PASSWORD} -h"${DB_HOST}" &>/dev/null || PGPASSWORD=${DB_PASSWORD} psql -h${DB_HOST} -U${DB_USER} -c "SELECT 1" }; do
+while ! { mysqladmin ping -u"${DB_USER}" -p"${DB_PASSWORD}" -h"${DB_HOST}" &>/dev/null || PGPASSWORD="${DB_PASSWORD}" psql -h"${DB_HOST}" -U"${DB_USER}" -d"${DB_NAME}" -c "SELECT 1" &>/dev/null; }; do
 		echo "Database server not ready yet, re-trying in 5 seconds..."
     sleep 5
 done