diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
index 29f43f6d87..caff8c8cbb 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioClientSocketPipelineSink.java
@@ -242,7 +242,7 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
                 wakenUp.set(false);
 
                 try {
-                    int selectedKeyCount = selector.select(10);
+                    SelectorUtil.select(selector);
 
                     // 'wakenUp.compareAndSet(false, true)' is always evaluated
                     // before calling 'selector.wakeup()' to reduce the wake-up
@@ -277,10 +277,7 @@ class NioClientSocketPipelineSink extends AbstractNioChannelSink {
                     }
 
                     processRegisterTaskQueue();
-
-                    if (selectedKeyCount > 0) {
-                        processSelectedKeys(selector.selectedKeys());
-                    }
+                    processSelectedKeys(selector.selectedKeys());
 
                     // Handle connection timeout every 10 milliseconds approximately.
                     long currentTimeNanos = System.nanoTime();