diff --git a/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java b/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java
index 7d09b08df..b36a14001 100644
--- a/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java
+++ b/src/main/java/org/jboss/ejb/client/DiscoveryEJBClientInterceptor.java
@@ -188,10 +188,11 @@ static void setupSessionAffinities(EJBSessionCreationInvocationContext context)
     private void processMissingTarget(final AbstractInvocationContext context) {
         final URI destination = context.getDestination();
 
-        if (destination == null) {
+        if (destination == null || context.getTargetAffinity() == Affinity.LOCAL) {
             // nothing we can/should do.
             return;
         }
+
         // Oops, we got some wrong information!
         addBlackListedDestination(context, destination);
 
diff --git a/src/main/java/org/jboss/ejb/client/NamingEJBClientInterceptor.java b/src/main/java/org/jboss/ejb/client/NamingEJBClientInterceptor.java
index 1af61198b..1f9446d3e 100644
--- a/src/main/java/org/jboss/ejb/client/NamingEJBClientInterceptor.java
+++ b/src/main/java/org/jboss/ejb/client/NamingEJBClientInterceptor.java
@@ -172,7 +172,7 @@ private static List<URI> findPreferredURIs(AbstractInvocationContext context, Li
 
     private void processMissingTarget(final AbstractInvocationContext context) {
         final URI destination = context.getDestination();
-        if (destination == null) {
+        if (destination == null || context.getTargetAffinity() == Affinity.LOCAL) {
             // some later interceptor cleared it out on us
             return;
         }