diff --git a/weed/command/volume.go b/weed/command/volume.go
index 3a81bce18..20935bf16 100644
--- a/weed/command/volume.go
+++ b/weed/command/volume.go
@@ -365,7 +365,7 @@ func (v VolumeServerOptions) startClusterHttpService(handler http.Handler) httpd
 
 	httpDown := httpdown.HTTP{
 		KillTimeout: time.Minute,
-		StopTimeout: time.Minute,
+		StopTimeout: 30 * time.Second,
 		CertFile:    certFile,
 		KeyFile:     keyFile}
 	clusterHttpServer := httpDown.Serve(&http.Server{Handler: handler}, listener)