diff --git a/src/main/java/org/jboss/ejb/protocol/remote/ProtocolV1ObjectResolver.java b/src/main/java/org/jboss/ejb/protocol/remote/ProtocolV1ObjectResolver.java
index 10be9e1d8..e6f8e7747 100644
--- a/src/main/java/org/jboss/ejb/protocol/remote/ProtocolV1ObjectResolver.java
+++ b/src/main/java/org/jboss/ejb/protocol/remote/ProtocolV1ObjectResolver.java
@@ -57,6 +57,8 @@ public Object readResolve(final Object replacement) {
                 // Peer (server) sent their own node name; make it a URI if we can
                 return peerUriAffinity;
             }
+        } else if(replacement == Affinity.NONE) {
+            return peerUriAffinity;
         }
         return replacement;
     }