diff --git a/router/java/src/net/i2p/router/ClientMessagePool.java b/router/java/src/net/i2p/router/ClientMessagePool.java
index 2c27d8089ad3d3fae8bc2898e0e89e99a588f8bd..021e98378ae2f17e0a2efd0e049211f8d9eb8557 100644
--- a/router/java/src/net/i2p/router/ClientMessagePool.java
+++ b/router/java/src/net/i2p/router/ClientMessagePool.java
@@ -63,9 +63,9 @@ public class ClientMessagePool {
      *
      */
     public void add(ClientMessage msg, boolean isDefinitelyRemote) {
-        if ( !isDefinitelyRemote ||
-             (_context.clientManager().isLocal(msg.getDestination())) ||
-             (_context.clientManager().isLocal(msg.getDestinationHash())) ) {
+        if (!isDefinitelyRemote &&
+            (_context.clientManager().isLocal(msg.getDestination()) ||
+             _context.clientManager().isLocal(msg.getDestinationHash()))) {
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug("Adding message for local delivery");
             _context.clientManager().messageReceived(msg);