diff --git a/docs/config/network.en.md b/docs/config/network.en.md
index bd9b0a1c..ef5a19b7 100644
--- a/docs/config/network.en.md
+++ b/docs/config/network.en.md
@@ -74,7 +74,7 @@ Consider `use_rdmacm` for such networks.
 ## use_rdmacm
 
 - Type: boolean
-- Default: true
+- Default: false
 
 Use an alternative implementation of RDMA through RDMA-CM (Connection
 Manager). Works with all RDMA networks: Infiniband, iWARP and
diff --git a/docs/config/network.ru.md b/docs/config/network.ru.md
index cddef22b..70de102e 100644
--- a/docs/config/network.ru.md
+++ b/docs/config/network.ru.md
@@ -74,7 +74,7 @@ RDMA-устройства, но они не имеют соединения с 
 ## use_rdmacm
 
 - Тип: булево (да/нет)
-- Значение по умолчанию: true
+- Значение по умолчанию: false
 
 Использовать альтернативную реализацию RDMA на основе RDMA-CM (Connection
 Manager). Работает со всеми типами RDMA-сетей: Infiniband, iWARP и
diff --git a/docs/config/src/network.yml b/docs/config/src/network.yml
index 47ee5a1f..1dadc706 100644
--- a/docs/config/src/network.yml
+++ b/docs/config/src/network.yml
@@ -51,7 +51,7 @@
     Рассмотрите включение `use_rdmacm` для таких сетей.
 - name: use_rdmacm
   type: bool
-  default: true
+  default: false
   info: |
     Use an alternative implementation of RDMA through RDMA-CM (Connection
     Manager). Works with all RDMA networks: Infiniband, iWARP and
diff --git a/src/client/etcd_state_client.cpp b/src/client/etcd_state_client.cpp
index 3e60688f..8188cccb 100644
--- a/src/client/etcd_state_client.cpp
+++ b/src/client/etcd_state_client.cpp
@@ -1186,9 +1186,7 @@ void etcd_state_client_t::parse_state(const etcd_kv_t & kv)
         osd_num_t peer_osd = std::stoull(key.substr(etcd_prefix.length()+11));
         if (peer_osd > 0)
         {
-            if (value.is_object() && value["state"] == "up" &&
-                value["addresses"].is_array() &&
-                value["port"].int64_value() > 0 && value["port"].int64_value() < 65536)
+            if (value.is_object() && value["state"] == "up")
             {
                 this->peer_states[peer_osd] = value;
                 this->seen_peers.insert(peer_osd);
diff --git a/src/client/msgr_rdmacm.cpp b/src/client/msgr_rdmacm.cpp
index e72c135f..8be31326 100644
--- a/src/client/msgr_rdmacm.cpp
+++ b/src/client/msgr_rdmacm.cpp
@@ -515,7 +515,7 @@ void osd_messenger_t::rdmacm_established(rdma_cm_event *ev)
     cl->peer_fd = conn->peer_fd;
     cl->peer_state = PEER_RDMA;
     cl->connect_timeout_id = -1;
-    cl->in_osd_num = peer_osd;
+    cl->osd_num = peer_osd;
     cl->in_buf = malloc_or_die(receive_buffer_size);
     cl->rdma_conn = rc;
     clients[conn->peer_fd] = cl;