diff --git a/src/server/bnetserver/Server/Session.cpp b/src/server/bnetserver/Server/Session.cpp
index d2a8dae7e26..e1abc75522b 100644
--- a/src/server/bnetserver/Server/Session.cpp
+++ b/src/server/bnetserver/Server/Session.cpp
@@ -506,9 +506,7 @@ void Battlenet::Session::HandleJoinRequestV2(WoWRealm::JoinRequestV2 const& join
     stmt->setString(4, _gameAccountInfo->Name);
     LoginDatabase.DirectExecute(stmt);
 
-    joinResponse->IPv4.emplace_back(*realm->ExternalAddress, realm->Port);
-    if (*realm->ExternalAddress != *realm->LocalAddress)
-        joinResponse->IPv4.emplace_back(*realm->LocalAddress, realm->Port);
+    joinResponse->IPv4.push_back(realm->GetAddressForClient(GetRemoteIpAddress()));
 
     AsyncWrite(joinResponse);
 }