diff --git a/solr/src/java/org/apache/solr/cloud/SolrZkServer.java b/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
index d3ff0969f5e..d96718324aa 100644
--- a/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
+++ b/solr/src/java/org/apache/solr/cloud/SolrZkServer.java
@@ -283,7 +283,7 @@ class SolrZkServerProps extends QuorumPeerConfig {
     // multiple matches... try to figure out by port.
     for (QuorumPeer.QuorumServer server : slist.values()) {
       if (server.addr.equals(thisAddr)) {
-        if (clientPortAddress != null || clientPortAddress.getPort() <= 0)
+        if (clientPortAddress == null || clientPortAddress.getPort() <= 0)
           setClientPort(server.addr.getPort() - 1);
         return server.id;
       }