diff --git a/etcdmain/etcd.go b/etcdmain/etcd.go
index d4edb56b51cd..2f7f00d61ad7 100644
--- a/etcdmain/etcd.go
+++ b/etcdmain/etcd.go
@@ -187,7 +187,7 @@ func startEtcd(cfg *embed.Config) (<-chan struct{}, <-chan error, error) {
 	if err != nil {
 		return nil, nil, err
 	}
-	osutil.RegisterInterruptHandler(e.Server.Stop)
+	osutil.RegisterInterruptHandler(e.Close)
 	select {
 	case <-e.Server.ReadyNotify(): // wait for e.Server to join the cluster
 	case <-e.Server.StopNotify(): // publish aborted from 'ErrStopped'