diff --git a/fml/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java b/fml/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java
index 7d8b6c64f..b0cbd703a 100644
--- a/fml/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java
+++ b/fml/src/main/java/cpw/mods/fml/common/network/NetworkRegistry.java
@@ -36,6 +36,7 @@ import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.ModContainer;
 import cpw.mods.fml.common.discovery.ASMDataTable;
+import cpw.mods.fml.common.network.FMLOutboundHandler.OutboundTarget;
 import cpw.mods.fml.common.network.handshake.NetworkDispatcher;
 import cpw.mods.fml.common.network.internal.FMLProxyPacket;
 import cpw.mods.fml.common.network.internal.NetworkModHolder;
@@ -311,6 +312,8 @@ public enum NetworkRegistry
         NetworkHandshakeEstablished handshake = new NetworkHandshakeEstablished(networkDispatcher, networkDispatcher.getNetHandler(), origin);
         for (Entry<String, FMLEmbeddedChannel> channel : channels.get(origin).entrySet())
         {
+            channel.getValue().attr(FMLOutboundHandler.FML_MESSAGETARGET).set(OutboundTarget.DISPATCHER);
+            channel.getValue().attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(networkDispatcher);
             channel.getValue().pipeline().fireUserEventTriggered(handshake);
         }
     }