diff --git a/src/dorkbox/network/connection/registration/local/RegistrationLocalHandler.java b/src/dorkbox/network/connection/registration/local/RegistrationLocalHandler.java
index 4a550861..c4dad9af 100644
--- a/src/dorkbox/network/connection/registration/local/RegistrationLocalHandler.java
+++ b/src/dorkbox/network/connection/registration/local/RegistrationLocalHandler.java
@@ -43,8 +43,6 @@ class RegistrationLocalHandler extends RegistrationHandler {
                .set(metaChannel);
 
         logger.trace("New LOCAL connection.");
-
-        registrationWrapper.connection0(metaChannel, null);
     }
 
     @Override
diff --git a/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerClient.java b/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerClient.java
index d45eba9c..ee29c9f8 100644
--- a/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerClient.java
+++ b/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerClient.java
@@ -32,14 +32,6 @@ class RegistrationLocalHandlerClient extends RegistrationLocalHandler {
         super(name, registrationWrapper);
     }
 
-    /**
-     * STEP 1: Channel is first created
-     */
-//  Calls the super class to init the local channel
-//  @Override
-//  protected void initChannel(Channel channel) {
-//  }
-
     /**
      * STEP 2: Channel is now active. Start the registration process
      */
@@ -75,11 +67,13 @@ class RegistrationLocalHandlerClient extends RegistrationLocalHandler {
             // Event though a local channel is XOR with everything else, we still have to make the client clean up it's state.
             registrationWrapper.startNextProtocolRegistration();
 
+            registrationWrapper.connection0(metaChannel, null);
             ConnectionImpl connection = metaChannel.connection;
 
             // have to setup connection handler
             pipeline.addLast(CONNECTION_HANDLER, connection);
 
+
             registrationWrapper.connectionConnected0(connection);
         }
         else {
diff --git a/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerServer.java b/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerServer.java
index 1826732b..7cd75131 100644
--- a/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerServer.java
+++ b/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerServer.java
@@ -31,14 +31,6 @@ class RegistrationLocalHandlerServer extends RegistrationLocalHandler {
         super(name, registrationWrapper);
     }
 
-    /**
-     * STEP 1: Channel is first created
-     */
-//  Calls the super class to init the local channel
-//  @Override
-//  protected void initChannel(Channel channel) {
-//  }
-
     /**
      * STEP 2: Channel is now active. Start the registration process (Client starts the process)
      */
@@ -73,6 +65,7 @@ class RegistrationLocalHandlerServer extends RegistrationLocalHandler {
         MetaChannel metaChannel = channel.attr(META_CHANNEL)
                                          .getAndSet(null);
         if (metaChannel != null) {
+            registrationWrapper.connection0(metaChannel, null);
             ConnectionImpl connection = metaChannel.connection;
 
             if (connection != null) {