diff --git a/doc/docker/development/docker-compose.yml b/doc/docker/development/docker-compose.yml
index cbc9bc0342..911c2d5ae8 100644
--- a/doc/docker/development/docker-compose.yml
+++ b/doc/docker/development/docker-compose.yml
@@ -228,7 +228,14 @@ services:
   # Rocket.Chat server
   #rocketchat:
   #  image: quay.io/egroupware/rocket.chat:latest
-  #  command: bash -c 'for i in `seq 1 30`; do node main.js && s=$$? && break || s=$$?; echo "Tried $$i times. Waiting 5 secs..."; sleep 5; done; (exit $$s)'
+  #  command: >
+  #      sh -c
+  #        "while true; do
+  #          node main.js &&
+  #          s=$$? && break || s=$$?;
+  #          echo \"Could not reach MongoDB. Waiting 5 secs ...\";
+  #          sleep 5;
+  #        done; (exit $$s)"
   #  restart: unless-stopped
   #  volumes:
   #    - $PWD/data/default/rocketchat/uploads:/app/uploads
diff --git a/doc/docker/docker-compose.yml b/doc/docker/docker-compose.yml
index 7ed5a96c91..d8874c2968 100644
--- a/doc/docker/docker-compose.yml
+++ b/doc/docker/docker-compose.yml
@@ -218,7 +218,14 @@ services:
   # Rocket.Chat server
   rocketchat:
     image: rocketchat/rocket.chat:latest
-    command: bash -c 'for i in `seq 1 30`; do node main.js && s=$$? && break || s=$$?; echo "Tried $$i times. Waiting 5 secs..."; sleep 5; done; (exit $$s)'
+    command: >
+      sh -c
+        "while true; do
+          node main.js &&
+          s=$$? && break || s=$$?;
+          echo \"Could not reach MongoDB. Waiting 5 secs ...\";
+          sleep 5;
+        done; (exit $$s)"
     restart: unless-stopped
     volumes:
       - $PWD/data/default/rocketchat/uploads:/app/uploads