diff --git a/implementation/endpoints/include/local_tcp_server_endpoint_impl.hpp b/implementation/endpoints/include/local_tcp_server_endpoint_impl.hpp
index 1008c1a7f..4d21d11d4 100644
--- a/implementation/endpoints/include/local_tcp_server_endpoint_impl.hpp
+++ b/implementation/endpoints/include/local_tcp_server_endpoint_impl.hpp
@@ -154,7 +154,7 @@ class local_tcp_server_endpoint_impl
     bool add_connection(const client_t &_client,
             const std::shared_ptr<connection> &_connection);
     void remove_connection(const client_t &_client);
-    void accept_cbk(const connection::ptr& _connection,
+    void accept_cbk(connection::ptr _connection,
                     boost::system::error_code const &_error);
     std::string get_remote_information(
             const target_data_iterator_type _queue_iterator) const;
diff --git a/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp b/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp
index a0d8bde1e..94c39bb7e 100644
--- a/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp
+++ b/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp
@@ -156,7 +156,7 @@ class local_uds_server_endpoint_impl: public local_uds_server_endpoint_base_impl
     bool add_connection(const client_t &_client,
             const std::shared_ptr<connection> &_connection);
     void remove_connection(const client_t &_client);
-    void accept_cbk(const connection::ptr& _connection,
+    void accept_cbk(connection::ptr _connection,
                     boost::system::error_code const &_error);
     std::string get_remote_information(
             const target_data_iterator_type _queue_iterator) const;
diff --git a/implementation/endpoints/include/tcp_server_endpoint_impl.hpp b/implementation/endpoints/include/tcp_server_endpoint_impl.hpp
index dd7b9554c..47b3389bd 100644
--- a/implementation/endpoints/include/tcp_server_endpoint_impl.hpp
+++ b/implementation/endpoints/include/tcp_server_endpoint_impl.hpp
@@ -149,7 +149,7 @@ class tcp_server_endpoint_impl: public tcp_server_endpoint_base_impl {
 
 private:
     void remove_connection(connection *_connection);
-    void accept_cbk(const connection::ptr& _connection,
+    void accept_cbk(connection::ptr _connection,
                     boost::system::error_code const &_error);
     std::string get_remote_information(
             const target_data_iterator_type _it) const;
diff --git a/implementation/endpoints/src/local_tcp_server_endpoint_impl.cpp b/implementation/endpoints/src/local_tcp_server_endpoint_impl.cpp
index bd9ec7ab2..3b2e175e7 100644
--- a/implementation/endpoints/src/local_tcp_server_endpoint_impl.cpp
+++ b/implementation/endpoints/src/local_tcp_server_endpoint_impl.cpp
@@ -230,7 +230,7 @@ void local_tcp_server_endpoint_impl::remove_connection(
 }
 
 void local_tcp_server_endpoint_impl::accept_cbk(
-        const connection::ptr& _connection, boost::system::error_code const &_error) {
+        connection::ptr _connection, boost::system::error_code const &_error) {
     if (!_error) {
         boost::system::error_code its_error;
         endpoint_type remote;
diff --git a/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp b/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp
index 2717a6869..5b8560bdc 100644
--- a/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp
+++ b/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp
@@ -242,7 +242,7 @@ void local_uds_server_endpoint_impl::remove_connection(
 }
 
 void local_uds_server_endpoint_impl::accept_cbk(
-        const connection::ptr& _connection, boost::system::error_code const &_error) {
+        connection::ptr _connection, boost::system::error_code const &_error) {
     if (_error != boost::asio::error::bad_descriptor
             && _error != boost::asio::error::operation_aborted
             && _error != boost::asio::error::no_descriptors) {
diff --git a/implementation/endpoints/src/tcp_server_endpoint_impl.cpp b/implementation/endpoints/src/tcp_server_endpoint_impl.cpp
index f050ceb1f..45561b67c 100644
--- a/implementation/endpoints/src/tcp_server_endpoint_impl.cpp
+++ b/implementation/endpoints/src/tcp_server_endpoint_impl.cpp
@@ -242,7 +242,7 @@ void tcp_server_endpoint_impl::remove_connection(
     }
 }
 
-void tcp_server_endpoint_impl::accept_cbk(const connection::ptr& _connection,
+void tcp_server_endpoint_impl::accept_cbk(connection::ptr _connection,
                                           boost::system::error_code const& _error) {
 
     if (!_error) {