diff --git a/docker/docker-compose.staging.yml b/docker/docker-compose.staging.yml
index ac44c07d6b..4ab3ef284a 100644
--- a/docker/docker-compose.staging.yml
+++ b/docker/docker-compose.staging.yml
@@ -33,7 +33,11 @@ services:
       - postgres_staging:/var/lib/postgresql/data
     logging: *default-logging
     healthcheck:
-      test: ['CMD-SHELL', 'pg_isready -U ${DB_USERNAME:-cipherbox}']
+      test:
+        [
+          'CMD-SHELL',
+          'pg_isready -U ${DB_USERNAME:-cipherbox} -d ${DB_DATABASE:-cipherbox_staging}',
+        ]
       interval: 5s
       timeout: 5s
       retries: 5