diff --git a/Dorkbox-Network/src/dorkbox/network/connection/RegistrationWrapper.java b/Dorkbox-Network/src/dorkbox/network/connection/RegistrationWrapper.java
index 20b20752..4ce75373 100644
--- a/Dorkbox-Network/src/dorkbox/network/connection/RegistrationWrapper.java
+++ b/Dorkbox-Network/src/dorkbox/network/connection/RegistrationWrapper.java
@@ -74,6 +74,13 @@ class RegistrationWrapper<C extends Connection> implements UdpServer {
         }
     }
 
+    /**
+     * @return true if RMI is enabled
+     */
+    public boolean rmiEnabled() {
+        return endPoint.globalRmiBridge != null;
+    }
+
     public
     KryoEncoder getKryoEncoder() {
         return this.kryoEncoder;
diff --git a/Dorkbox-Network/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerClient.java b/Dorkbox-Network/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerClient.java
index ff5d0c63..9e66a6e3 100644
--- a/Dorkbox-Network/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerClient.java
+++ b/Dorkbox-Network/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerClient.java
@@ -15,6 +15,7 @@
  */
 package dorkbox.network.connection.registration.local;
 
+import dorkbox.network.connection.Connection;
 import dorkbox.network.connection.ConnectionImpl;
 import dorkbox.network.connection.RegistrationWrapper;
 import dorkbox.network.connection.registration.MetaChannel;
@@ -26,10 +27,10 @@ import io.netty.channel.ChannelPipeline;
 import io.netty.util.ReferenceCountUtil;
 
 public
-class RegistrationLocalHandlerClient extends RegistrationLocalHandler {
+class RegistrationLocalHandlerClient<C extends Connection> extends RegistrationLocalHandler<C> {
 
     public
-    RegistrationLocalHandlerClient(String name, RegistrationWrapper registrationWrapper) {
+    RegistrationLocalHandlerClient(String name, RegistrationWrapper<C> registrationWrapper) {
         super(name, registrationWrapper);
     }
 
@@ -92,17 +93,18 @@ class RegistrationLocalHandlerClient extends RegistrationLocalHandler {
 
 
             // add our RMI handlers
-
-            ///////////////////////
-            // DECODE (or upstream)
-            ///////////////////////
-            pipeline.addFirst(LOCAL_RMI_ENCODER, decoder);
+            if (registrationWrapper.rmiEnabled()) {
+                ///////////////////////
+                // DECODE (or upstream)
+                ///////////////////////
+                pipeline.addFirst(LOCAL_RMI_ENCODER, decoder);
 
 
-            /////////////////////////
-            // ENCODE (or downstream)
-            /////////////////////////
-            pipeline.addFirst(LOCAL_RMI_DECODER, encoder);
+                /////////////////////////
+                // ENCODE (or downstream)
+                /////////////////////////
+                pipeline.addFirst(LOCAL_RMI_DECODER, encoder);
+            }
 
             // have to setup connection handler
             pipeline.addLast(CONNECTION_HANDLER, connection);
diff --git a/Dorkbox-Network/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerServer.java b/Dorkbox-Network/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerServer.java
index b77255f8..4e9649e9 100644
--- a/Dorkbox-Network/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerServer.java
+++ b/Dorkbox-Network/src/dorkbox/network/connection/registration/local/RegistrationLocalHandlerServer.java
@@ -93,17 +93,18 @@ class RegistrationLocalHandlerServer<C extends Connection> extends RegistrationL
 
         if (connection != null) {
             // add our RMI handlers
-
-            ///////////////////////
-            // DECODE (or upstream)
-            ///////////////////////
-            pipeline.addFirst(LOCAL_RMI_ENCODER, decoder);
+            if (registrationWrapper.rmiEnabled()) {
+                ///////////////////////
+                // DECODE (or upstream)
+                ///////////////////////
+                pipeline.addFirst(LOCAL_RMI_ENCODER, decoder);
 
 
-            /////////////////////////
-            // ENCODE (or downstream)
-            /////////////////////////
-            pipeline.addFirst(LOCAL_RMI_DECODER, encoder);
+                /////////////////////////
+                // ENCODE (or downstream)
+                /////////////////////////
+                pipeline.addFirst(LOCAL_RMI_DECODER, encoder);
+            }
 
             // have to setup connection handler
             pipeline.addLast(CONNECTION_HANDLER, connection);