diff --git a/entrypoint.sh b/entrypoint.sh
index 8290eb78ad2103232b4c1a94e121f4b7cbaa612b..95427bffb69d28dc2511b43a1b3d7720e305369e 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -30,7 +30,14 @@ export PGUSER=$value
 check_config "db_password" "$PASSWORD"
 export PGPASSWORD=$value
 
-if ! psql -l | grep $PGDATABASE; then
+
+echo "waiting until postgres is listening at ${PGHOST}..."
+while true; do
+    psql --list > /dev/null 2>&1 && break
+    sleep 1
+done
+
+if ! psql --list --no-align --tuples-only 2> /dev/null | grep ^$PGDATABASE\|; then
   	echo "Database $PGDATABASE does not exist"
   	DB_ARGS+=("--load-language")
   	DB_ARGS+=("fr_FR")