diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ipc_/Client.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ipc_/Client.java
index 9408a3052a1e..28f6b5ed4cbc 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ipc_/Client.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ipc_/Client.java
@@ -606,7 +606,7 @@ private synchronized void setupConnection(
                 InetAddress bindTo = bindToWildCardAddress ? null : localAddr;
                 LOG.debug("Binding {} to {}", principal,
                     (bindToWildCardAddress) ? "0.0.0.0" : localAddr);
-                this.socket.bind(new InetSocketAddress(localAddr, 0));
+                this.socket.bind(new InetSocketAddress(bindTo, 0));
               }
             }
           }
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/ipc_/TestClient.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ipc_/TestClient.java
new file mode 100644
index 000000000000..168a5406dd23
--- /dev/null
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/ipc_/TestClient.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.hadoop.ipc_;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.Socket;
+import java.util.function.Consumer;
+import javax.net.SocketFactory;
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.io.LongWritable;
+import org.apache.hadoop.io.retry.RetryPolicies;
+import org.apache.hadoop.security.KerberosInfo;
+import org.apache.hadoop.security.UserGroupInformation;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
+import org.mockito.ArgumentCaptor;
+
+/** Regression tests for the copied Hadoop RPC client. */
+class TestClient {
+
+  @KerberosInfo(serverPrincipal = "test.server.principal")
+  private interface TestProtocol {
+  }
+
+  @ParameterizedTest
+  @ValueSource(booleans = {false, true})
+  void testKerberosSocketBinding(boolean wildcard) throws Exception {
+    Configuration conf = new Configuration(false);
+    conf.setBoolean("ipc.client.bind.wildcard.addr", wildcard);
+    InetAddress localAddress = InetAddress.getByName("127.0.0.1");
+    InetSocketAddress server = new InetSocketAddress(localAddress, 12345);
+    UserGroupInformation ticket = mock(UserGroupInformation.class);
+    when(ticket.hasKerberosCredentials()).thenReturn(true);
+    when(ticket.getUserName()).thenReturn("client/127.0.0.1@EXAMPLE.COM");
+    Socket socket = mock(Socket.class);
+    when(socket.getLocalAddress()).thenReturn(localAddress);
+    SocketFactory factory = mock(SocketFactory.class);
+    when(factory.createSocket()).thenReturn(socket);
+    Client client = new Client(LongWritable.class, conf, factory);
+    try {
+      Client.ConnectionId remoteId = new Client.ConnectionId(
+          server, TestProtocol.class, ticket, 0, RetryPolicies.TRY_ONCE_THEN_FAIL, conf);
+      // Exercise the real binding code without starting RPC/SASL threads or requiring a KDC.
+      Class<?> connectionClass = Class.forName(Client.class.getName() + "$Connection");
+      Constructor<?> constructor = connectionClass.getDeclaredConstructor(
+          Client.class, Client.ConnectionId.class, int.class, Consumer.class);
+      constructor.setAccessible(true);
+      Object connection = constructor.newInstance(client, remoteId, 0, (Consumer<Object>) ignored -> { });
+      Method setupConnection = connectionClass.getDeclaredMethod("setupConnection", UserGroupInformation.class);
+      setupConnection.setAccessible(true);
+      setupConnection.invoke(connection, ticket);
+
+      ArgumentCaptor<InetSocketAddress> boundAddress = ArgumentCaptor.forClass(InetSocketAddress.class);
+      verify(socket).bind(boundAddress.capture());
+      assertEquals(wildcard, boundAddress.getValue().getAddress().isAnyLocalAddress());
+      if (!wildcard) {
+        assertEquals(localAddress, boundAddress.getValue().getAddress());
+      }
+      assertEquals(0, boundAddress.getValue().getPort());
+      verify(socket).connect(eq(server), anyInt());
+    } finally {
+      socket.close();
+      client.stop();
+    }
+  }
+}