diff --git a/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java
index 3df72e65c2ab..4c1efd69206c 100644
--- a/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java
+++ b/common/network-common/src/main/java/org/apache/spark/network/client/TransportClientFactory.java
@@ -279,7 +279,7 @@ public void initChannel(SocketChannel ch) {
     ChannelFuture cf = bootstrap.connect(address);
 
     if (connCreateTimeout <= 0) {
-      cf.awaitUninterruptibly();
+      cf.await();
       assert cf.isDone();
       if (cf.isCancelled()) {
         throw new IOException(String.format("Connecting to %s cancelled", address));