diff --git a/mon/antietcd_adapter.js b/mon/antietcd_adapter.js
index 381613cf..5747fe0b 100644
--- a/mon/antietcd_adapter.js
+++ b/mon/antietcd_adapter.js
@@ -78,7 +78,8 @@ class AntiEtcdAdapter
                     delete antietcd_config.cluster;
                     delete antietcd_config.cluster_key;
                 }
-                if (config.use_auth)
+                const use_auth = config.use_auth || config.use_auth == null && config.client_ca;
+                if (use_auth)
                 {
                     antietcd_config.client_cert_auth = true;
                     antietcd_config.auth_filter = vitastor_auth_filter;
diff --git a/src/client/etcd_state_client.cpp b/src/client/etcd_state_client.cpp
index 8817adf4..de014390 100644
--- a/src/client/etcd_state_client.cpp
+++ b/src/client/etcd_state_client.cpp
@@ -169,7 +169,12 @@ void etcd_state_client_t::parse_config(const json11::Json & config)
             add_etcd_url(ea.string_value());
         }
     }
-    if (this->osd_num)
+    if (this->etcd_client_cert != "")
+    {
+        this->etcd_client_cert = config["etcd_client_cert"].string_value();
+        this->etcd_client_key = config["etcd_client_key"].string_value();
+    }
+    else if (this->osd_num)
     {
         this->etcd_client_cert = config["osd_cert"].string_value();
         this->etcd_client_key = config["osd_pkey"].string_value();
@@ -179,11 +184,6 @@ void etcd_state_client_t::parse_config(const json11::Json & config)
         this->etcd_client_cert = config["cert"].string_value();
         this->etcd_client_key = config["pkey"].string_value();
     }
-    if (this->etcd_client_cert == "")
-    {
-        this->etcd_client_cert = config["etcd_client_cert"].string_value();
-        this->etcd_client_key = config["etcd_client_key"].string_value();
-    }
     this->etcd_ca = config["etcd_ca"].string_value();
     this->etcd_prefix = config["etcd_prefix"].string_value();
     if (this->etcd_prefix == "")