diff --git a/cluster/saltbase/salt/supervisor/docker-checker.sh b/cluster/saltbase/salt/supervisor/docker-checker.sh
index 05492e75589..3f40971a3bd 100755
--- a/cluster/saltbase/salt/supervisor/docker-checker.sh
+++ b/cluster/saltbase/salt/supervisor/docker-checker.sh
@@ -19,10 +19,16 @@
 # which in turn restarts docker.
 
 /etc/init.d/docker stop
+# Make sure docker gracefully terminated before start again
+while pidof docker > /dev/null; do
+    echo "waiting clean shutdown"
+    sleep 10
+done
+
 /etc/init.d/docker start
 
-echo "waiting a minute for startup"
-sleep 60
+echo "waiting 30s for startup"
+sleep 30
 
 while true; do
   if ! sudo timeout 10 docker version > /dev/null; then