diff --git a/server/client.go b/server/client.go
index e9e23516..41407f0a 100644
--- a/server/client.go
+++ b/server/client.go
@@ -3526,7 +3526,7 @@ func (c *client) processMsgResults(acc *Account, r *SublistResult, msg, deliver,
 			// Leaf node delivery audience is different however.
 			// Also leaf nodes are always no echo, so we make sure we are not
 			// going to send back to ourselves here.
-			if c != sub.client && (c.kind != ROUTER || !c.isSpokeLeafNode()) {
+			if c != sub.client && (c.kind != ROUTER || sub.client.isHubLeafNode()) {
 				c.addSubToRouteTargets(sub)
 			}
 			continue