diff --git a/nano/node/transport/tcp_server.cpp b/nano/node/transport/tcp_server.cpp
index 3b920c1c34..83dfef4924 100644
--- a/nano/node/transport/tcp_server.cpp
+++ b/nano/node/transport/tcp_server.cpp
@@ -171,6 +171,12 @@ void nano::transport::tcp_listener::on_connection (std::function<bool (std::shar
 
 			if (!ec_a)
 			{
+				{
+					// Best effort attempt to get endpoint addresses
+					boost::system::error_code ec;
+					new_connection->local = new_connection->tcp_socket.local_endpoint (ec);
+				}
+
 				// Make sure the new connection doesn't idle. Note that in most cases, the callback is going to start
 				// an IO operation immediately, which will start a timer.
 				new_connection->start ();