diff --git a/matrix.yml b/matrix.yml
index 423aca4..a16def2 100644
--- a/matrix.yml
+++ b/matrix.yml
@@ -373,6 +373,11 @@
               image: docker.io/matrixdotorg/synapse:latest
               restart: unless-stopped
               user: 3000:3000
+              healthcheck:
+                timeout: 30s
+                retries: 3
+                start_period: 300s
+                interval: 15s
               volumes:
                 - ./data:/data
                 - /etc/localtime:/etc/localtime:ro
@@ -558,6 +563,9 @@
                 - ${pipe}:/${pipebasename}
               entrypoint: /bin/bash -c 'cd /data && tail -F \"/${pipebasename}\" | /app/matrix_commander/matrix-commander -m _ --html --room \"$room\" --log-level INFO INFO'
               restart: unless-stopped
+              depends_on:
+                matrix.defiant.dedyn.io--synapse:
+                  condition: service_healthy
               " >> docker-compose.override.yml.new
           done