diff --git a/weed/command/master.go b/weed/command/master.go
index cb6b492e3..cd15defce 100644
--- a/weed/command/master.go
+++ b/weed/command/master.go
@@ -60,6 +60,9 @@ func runMaster(cmd *Command, args []string) bool {
 		}
 		pprof.StartCPUProfile(f)
 		defer pprof.StopCPUProfile()
+		OnInterrupt(func() {
+			pprof.StopCPUProfile()
+		})
 	}
 	if err := util.TestFolderWritable(*metaFolder); err != nil {
 		glog.Fatalf("Check Meta Folder (-mdir) Writable %s : %s", *metaFolder, err)