diff --git a/etcd/etcd.go b/etcd/etcd.go
index 316a7af91..f33dcf995 100644
--- a/etcd/etcd.go
+++ b/etcd/etcd.go
@@ -158,8 +158,8 @@ func (s *Server) Stop() {
 		return
 	}
 	s.mode = stop
-	close(s.stop)
 	s.t.stop()
+	close(s.stop)
 }
 
 func (s *Server) Bootstrap() {