diff --git a/docker/devicehub-django.entrypoint.sh b/docker/devicehub-django.entrypoint.sh
index 61967f1..5cd7817 100644
--- a/docker/devicehub-django.entrypoint.sh
+++ b/docker/devicehub-django.entrypoint.sh
@@ -53,10 +53,10 @@ END
         # generate config using env vars from docker
         cat > .env <<END
 ${dpp_env_vars:-}
-DB_USER='${DB_USER}'
-DB_PASSWORD='${DB_PASSWORD}'
-DB_HOST='${DB_HOST}'
-DB_DATABASE='${DB_DATABASE}'
+DB_USER='${DB_USER:-}'
+DB_PASSWORD='${DB_PASSWORD:-}'
+DB_HOST='${DB_HOST:-}'
+DB_DATABASE='${DB_DATABASE:-}'
 URL_MANUALS='${URL_MANUALS:-}'
 
 HOST='${HOST}'