diff --git a/Caddyfile b/Caddyfile
index c7532d6..f99b060 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -20,5 +20,5 @@
 		reverse_proxy shlink:8080
 	}
 
-	respond "not found" 404
+	respond "unauthorized domain" 404
 }
diff --git a/docker-compose.yml b/docker-compose.yml
index e81a2b0..1249bf6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -59,10 +59,19 @@ services:
             - shlink-db:/var/lib/postgresql/data
         networks:
             - proxy
+        healthcheck:
+            test:
+                [
+                    "CMD-SHELL",
+                    "pg_isready -U shlink -d shlink -h 127.0.0.1 || exit 1",
+                ]
+            interval: 5s
+            timeout: 5s
+            retries: 12
+            start_period: 10s
 
     shlink:
         image: shlinkio/shlink:stable
-        depends_on: [shlink-db]
         environment:
             - DEFAULT_DOMAIN=${SHORT_DOMAIN}
             - IS_HTTPS_ENABLED=true
@@ -82,6 +91,9 @@ services:
             - traefik.http.routers.shlink.tls.certresolver=le
         networks:
             - proxy
+        depends_on:
+          shlink-db:
+            condition: service_healthy
 
 networks:
     proxy: