diff --git a/docker-compose.yml b/docker-compose.yml
index bb00dc53c7..6b93d3bb59 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,6 +16,7 @@ services:
         links:
             - mongo
             - redis
+        stop_grace_period: 60s    
         volumes:
             - ~/sharelatex_data:/var/lib/sharelatex
             ########################################################################