diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
index 187b727d3b..f8ddcffcce 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioAcceptedSocketChannel.java
@@ -49,6 +49,5 @@ final class NioAcceptedSocketChannel extends NioSocketChannel {
         setConnected();
         
         fireChannelOpen(this);
-        fireChannelBound(this, getLocalAddress());
     }
 }
diff --git a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
index 0618dec97f..7ab0e1f683 100644
--- a/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
+++ b/src/main/java/org/jboss/netty/channel/socket/nio/NioWorker.java
@@ -786,18 +786,10 @@ class NioWorker implements Runnable {
                 }
             }
 
-            if (!server) {
-                if (!((NioClientSocketChannel) channel).boundManually) {
-                    fireChannelBound(channel, localAddress);
-                }
-                fireChannelConnected(channel, remoteAddress);
-            }
-            
-            // Handle the channelConnected in the worker thread
-            if (channel instanceof NioAcceptedSocketChannel) {
-                fireChannelConnected(channel, channel.getRemoteAddress());
-            
+            if (server || !((NioClientSocketChannel) channel).boundManually) {
+                fireChannelBound(channel, localAddress);
             }
+            fireChannelConnected(channel, remoteAddress);
         }
     }
 }