diff --git a/embed/etcd.go b/embed/etcd.go
index ee92358fa0c..8d5548415a0 100644
--- a/embed/etcd.go
+++ b/embed/etcd.go
@@ -129,7 +129,9 @@ func StartEtcd(inCfg *Config) (e *Etcd, err error) {
 	e.errc = make(chan error, len(e.Peers)+len(e.Clients)+2*len(e.sctxs))
 
 	e.Server.Start()
-	e.serve()
+	if err = e.serve(); err != nil {
+		return
+	}
 	<-e.Server.ReadyNotify()
 	return
 }