diff --git a/docker-compose.postgres.yml b/docker-compose.postgres.yml
index ed6cd82d..4b51565a 100644
--- a/docker-compose.postgres.yml
+++ b/docker-compose.postgres.yml
@@ -19,7 +19,7 @@ services:
     volumes:
       - postgres-data:/var/lib/postgresql
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-goclaw}"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-goclaw} -d ${POSTGRES_DB:-goclaw}"]
       interval: 5s
       timeout: 5s
       retries: 10