diff --git a/paper-server/src/main/java/io/papermc/paper/connection/PaperCommonConnection.java b/paper-server/src/main/java/io/papermc/paper/connection/PaperCommonConnection.java
index 8fc168da1d11..9593df35b29c 100644
--- a/paper-server/src/main/java/io/papermc/paper/connection/PaperCommonConnection.java
+++ b/paper-server/src/main/java/io/papermc/paper/connection/PaperCommonConnection.java
@@ -82,12 +82,12 @@ public boolean isTransferred() {
 
     @Override
     public SocketAddress getAddress() {
-        return this.handle.connection.getRemoteAddress();
+        return this.handle.connection.channel.remoteAddress();
     }
 
     @Override
     public InetSocketAddress getClientAddress() {
-        return (InetSocketAddress) this.handle.connection.channel.remoteAddress();
+        return (InetSocketAddress) this.handle.connection.getRemoteAddress();
     }
 
     @Override
diff --git a/paper-server/src/main/java/io/papermc/paper/connection/PaperPlayerLoginConnection.java b/paper-server/src/main/java/io/papermc/paper/connection/PaperPlayerLoginConnection.java
index 361ee106415f..6fcaa17ff5d9 100644
--- a/paper-server/src/main/java/io/papermc/paper/connection/PaperPlayerLoginConnection.java
+++ b/paper-server/src/main/java/io/papermc/paper/connection/PaperPlayerLoginConnection.java
@@ -34,12 +34,12 @@ public PaperPlayerLoginConnection(final ServerLoginPacketListenerImpl packetList
 
     @Override
     public SocketAddress getAddress() {
-        return this.packetListener.connection.getRemoteAddress();
+        return this.packetListener.connection.channel.remoteAddress();
     }
 
     @Override
     public InetSocketAddress getClientAddress() {
-        return (InetSocketAddress) this.packetListener.connection.channel.remoteAddress();
+        return (InetSocketAddress) this.packetListener.connection.getRemoteAddress();
     }
 
     @Override