diff --git a/plugin/etcd/setup.go b/plugin/etcd/setup.go
index bd81af513..0f70df5bc 100644
--- a/plugin/etcd/setup.go
+++ b/plugin/etcd/setup.go
@@ -99,8 +99,9 @@ func etcdParse(c *caddy.Controller) (*Etcd, error) {
 
 func newEtcdClient(endpoints []string, cc *tls.Config, username, password string) (*etcdcv3.Client, error) {
 	etcdCfg := etcdcv3.Config{
-		Endpoints: endpoints,
-		TLS:       cc,
+		Endpoints:         endpoints,
+		TLS:               cc,
+		DialKeepAliveTime: etcdTimeout,
 	}
 	if username != "" && password != "" {
 		etcdCfg.Username = username