diff --git a/src/main/java/org/redkale/net/AsyncIOGroup.java b/src/main/java/org/redkale/net/AsyncIOGroup.java
index d9a344d58..1e7b8bb88 100644
--- a/src/main/java/org/redkale/net/AsyncIOGroup.java
+++ b/src/main/java/org/redkale/net/AsyncIOGroup.java
@@ -237,9 +237,7 @@ public class AsyncIOGroup extends AsyncGroup {
         } catch (IOException e) {
             return CompletableFuture.failedFuture(e);
         }
-        int seconds = connectTimeoutSeconds > 0 ? connectTimeoutSeconds : 6;
-        final Supplier<String> timeoutMsg = () -> address + " connect timeout";
-        final CompletableFuture future = Utility.orTimeout(new CompletableFuture(), timeoutMsg, seconds, TimeUnit.SECONDS);
+        final CompletableFuture future = new CompletableFuture();
         conn.connect(address, null, new CompletionHandler<Void, Void>() {
             @Override
             public void completed(Void result, Void attachment) {
@@ -265,7 +263,9 @@ public class AsyncIOGroup extends AsyncGroup {
                 future.completeExceptionally(exc);
             }
         });
-        return Utility.orTimeout(future, timeoutMsg, 30, TimeUnit.SECONDS);
+        int seconds = connectTimeoutSeconds > 0 ? connectTimeoutSeconds : 6;
+        final Supplier<String> timeoutMsg = () -> address + " tcp-connect timeout";
+        return Utility.orTimeout(future, timeoutMsg, seconds, TimeUnit.SECONDS);
     }
 
     //创建一个AsyncConnection对象，只给测试代码使用
diff --git a/src/main/java/org/redkale/net/client/Client.java b/src/main/java/org/redkale/net/client/Client.java
index 245890eae..c68dc0290 100644
--- a/src/main/java/org/redkale/net/client/Client.java
+++ b/src/main/java/org/redkale/net/client/Client.java
@@ -388,9 +388,9 @@ public abstract class Client<C extends ClientConnection<R, P>, R extends ClientR
             });
         } else {
             int seconds = connectTimeoutSeconds > 0 ? connectTimeoutSeconds : 6;
-            CompletableFuture rs = Utility.orTimeout(new CompletableFuture(), () -> addr + " connect timeout", seconds, TimeUnit.SECONDS);
+            CompletableFuture rs = new CompletableFuture();
             waitQueue.offer(rs);
-            return rs;
+            return Utility.orTimeout(rs, () -> addr + " connect timeout", seconds, TimeUnit.SECONDS);
         }
     }