diff --git a/CHANGELOG.md b/CHANGELOG.md
index b6d4f73..e82461b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Changelog
 
+- 2018-10-30 [Bugfix] Fix rabbitmq restart policy
 - 2018-10-03 [Improvement/Bugfix] Fix and accelerate Android application build
 - 2018-10-02 [Improvement] Bump Open edX version to hawthorn.2
 - 2018-09-30 [Bugfix] Fix CMS celery worker, including export tasks
diff --git a/docker-compose.yml b/docker-compose.yml
index 696721e..374f351 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,7 +33,7 @@ services:
       memlock:
         soft: -1
         hard: -1
-    restart: "unless-stopped"
+    restart: unless-stopped
     volumes:
       - ./data/elasticsearch:/usr/share/elasticsearch/data
 
@@ -53,6 +53,7 @@ services:
     image: rabbitmq:3.6.10
     volumes:
       - ./data/rabbitmq:/var/lib/rabbitmq
+    restart: unless-stopped
 
   # Simple SMTP server
   smtp: