diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java
index 608537e90a..db7bfc9a80 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannel.java
@@ -42,14 +42,15 @@ final class NioServerSocketChannel extends AbstractServerChannel
     final ServerSocketChannel socket;
     final Lock shutdownLock = new ReentrantLock();
     final NioWorker worker;
+    final WorkerPool<NioWorker> workers;
     
     
     private final ServerSocketChannelConfig config;
 
     static NioServerSocketChannel create(ChannelFactory factory,
-            ChannelPipeline pipeline, ChannelSink sink, NioWorker worker) {
+            ChannelPipeline pipeline, ChannelSink sink, NioWorker worker, WorkerPool<NioWorker> workers) {
         NioServerSocketChannel instance =
-                new NioServerSocketChannel(factory, pipeline, sink, worker);
+                new NioServerSocketChannel(factory, pipeline, sink, worker, workers);
         fireChannelOpen(instance);
         return instance;
     }
@@ -57,10 +58,11 @@ final class NioServerSocketChannel extends AbstractServerChannel
     private NioServerSocketChannel(
             ChannelFactory factory,
             ChannelPipeline pipeline,
-            ChannelSink sink, NioWorker worker) {
+            ChannelSink sink, NioWorker worker, WorkerPool<NioWorker> workers) {
 
         super(factory, pipeline, sink);
         this.worker = worker;
+        this.workers = workers;
         try {
             socket = ServerSocketChannel.open();
         } catch (IOException e) {
diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannelFactory.java b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannelFactory.java
index 57ed6ecc34..33b0c4fa67 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannelFactory.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketChannelFactory.java
@@ -137,13 +137,13 @@ public class NioServerSocketChannelFactory implements ServerSocketChannelFactory
         }
        
         this.workerPool = workerPool;
-        sink = new NioServerSocketPipelineSink(workerPool);
+        sink = new NioServerSocketPipelineSink();
     }
 
     
     @Override
     public ServerSocketChannel newChannel(ChannelPipeline pipeline) {
-        return NioServerSocketChannel.create(this, pipeline, sink, workerPool.nextWorker());
+        return NioServerSocketChannel.create(this, pipeline, sink, workerPool.nextWorker(), workerPool);
     }
 
     @Override
diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java
index dbcf749f74..278f5d8873 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/NioServerSocketPipelineSink.java
@@ -35,12 +35,6 @@ class NioServerSocketPipelineSink extends AbstractNioChannelSink {
     static final InternalLogger logger =
         InternalLoggerFactory.getInstance(NioServerSocketPipelineSink.class);
 
-    private final WorkerPool<NioWorker> workerPool;
-
-    NioServerSocketPipelineSink(WorkerPool<NioWorker> workerPool) {
-        this.workerPool = workerPool;
-    }
-
     @Override
     public void eventSunk(
             ChannelPipeline pipeline, ChannelEvent e) throws Exception {
@@ -124,7 +118,7 @@ class NioServerSocketPipelineSink extends AbstractNioChannelSink {
             future.setSuccess();
             fireChannelBound(channel, channel.getLocalAddress());
 
-            workerPool.nextWorker().registerWithWorker(channel, future);
+            channel.getWorker().registerWithWorker(channel, future);
             
         } catch (Throwable t) {
             future.setFailure(t);
diff --git a/transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java b/transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java
index 0f3ace41de..da9b10bf0b 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/NioWorker.java
@@ -127,8 +127,7 @@ public class NioWorker extends SelectorEventLoop {
             boolean registered = channel.getJdkChannel().isRegistered();
             if (!registered) {
                 synchronized (channel.interestOpsLock) {
-                    channel.getJdkChannel().register(
-                            selector, channel.getRawInterestOps(), channel);
+                    channel.getJdkChannel().register(selector, channel.getRawInterestOps(), channel);
                 }
                 
             } else {
diff --git a/transport/src/main/java/io/netty/channel/socket/nio/SelectorEventLoop.java b/transport/src/main/java/io/netty/channel/socket/nio/SelectorEventLoop.java
index 6bd75de725..575e515d1d 100644
--- a/transport/src/main/java/io/netty/channel/socket/nio/SelectorEventLoop.java
+++ b/transport/src/main/java/io/netty/channel/socket/nio/SelectorEventLoop.java
@@ -346,8 +346,10 @@ abstract class SelectorEventLoop extends SingleThreadEventLoop {
                 // TODO: Remove the casting stuff
                 ChannelPipeline pipeline =
                         channel.getConfig().getPipelineFactory().getPipeline();
-                registerTask(NioAcceptedSocketChannel.create(channel.getFactory(), pipeline, channel,
-                        channel.getPipeline().getSink(), acceptedSocket, (NioWorker) this), null);
+                NioWorker worker = channel.workers.nextWorker();
+                
+                worker.registerWithWorker(NioAcceptedSocketChannel.create(channel.getFactory(), pipeline, channel,
+                        channel.getPipeline().getSink(), acceptedSocket, worker), null);
                 handled = true;
             }
             return handled;