diff --git a/src/dorkbox/network/rmi/RmiObjectLocalHandler.java b/src/dorkbox/network/rmi/RmiObjectLocalHandler.java
index 5b824c7e..77d8bd98 100644
--- a/src/dorkbox/network/rmi/RmiObjectLocalHandler.java
+++ b/src/dorkbox/network/rmi/RmiObjectLocalHandler.java
@@ -186,7 +186,7 @@ class RmiObjectLocalHandler extends RmiObjectHandler {
                     // connections -- even if this "slows down" the speed/performance of what "local" connections offer.
                     proxyObject = connection.getProxyObject(registration.rmiId, interfaceClass);
 
-                    if (proxyObject != null) {
+                    if (proxyObject != null && registration.remoteObject != null) {
                         // have to save A and B so we can correctly switch as necessary
                         //noinspection SynchronizeOnNonFinalField
                         synchronized (implToProxy) {