diff --git a/etcd/etcd.go b/etcd/etcd.go
index c98960954..cf39e7932 100644
--- a/etcd/etcd.go
+++ b/etcd/etcd.go
@@ -223,8 +223,8 @@ func (e *Etcd) Run() {
 }
 
 func (e *Etcd) Stop() {
-	e.listener.Close()
 	e.peerListener.Close()
+	e.listener.Close()
 }
 
 func (e *Etcd) StopNotify() chan bool {