diff --git a/src/client/rpc/ld_rpc_data_ws.cpp b/src/client/rpc/ld_rpc_data_ws.cpp
index c7d6a8a6240838370e14f88f21a4e9bff9cdbd72..74767cfe8cfb5bd1380d9dee3306190adaefa1de 100644
--- a/src/client/rpc/ld_rpc_data_ws.cpp
+++ b/src/client/rpc/ld_rpc_data_ws.cpp
@@ -121,8 +121,7 @@ ssize_t write(const string& path, const void* buf, const bool append_flag,
             total_chunk_size -= chnk_rpad(offset + write_size, CHUNKSIZE);
         }
 
-        auto endp = CTX->hosts2().at(
-            CTX->distributor()->locate_file_metadata(path));
+        auto endp = CTX->hosts2().at(target);
 
         try {
 
@@ -285,8 +284,7 @@ ssize_t read(const string& path, void* buf, const off64_t offset, const size_t r
             total_chunk_size -= chnk_rpad(offset + read_size, CHUNKSIZE);
         }
 
-        auto endp = CTX->hosts2().at(
-            CTX->distributor()->locate_file_metadata(path));
+        auto endp = CTX->hosts2().at(target);
 
         try {