diff --git a/docker-compose.yml b/docker-compose.yml
index 2f803fc4..57f307ad 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -118,7 +118,7 @@ services:
       - taiga
     depends_on:
       taiga-events-rabbitmq:
-        condition: service_started
+        condition: service_healthy
 
   taiga-events-rabbitmq:
     image: rabbitmq:3.8-management-alpine
@@ -132,6 +132,12 @@ services:
       - taiga-events-rabbitmq-data:/var/lib/rabbitmq
     networks:
       - taiga
+    healthcheck:
+      test: ["CMD", "rabbitmq-diagnostics", "check_running"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
 
   taiga-protected:
     image: taigaio/taiga-protected:latest