diff --git a/etcd/embed.go b/etcd/embed.go
index a74ae1c7d..0167f6b42 100644
--- a/etcd/embed.go
+++ b/etcd/embed.go
@@ -210,6 +210,8 @@ func (e *Etcd) retryClient(fn func(cli *clientv3.Client) error) (err error) {
 			e.cli = cli
 			e.cliMu.Unlock()
 			break
+		case nil:
+			return nil
 		default:
 			msg := err.Error()
 			if !strings.HasPrefix(msg, "etcdserver: request timed out") {