diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
index cf9cd5f2f1d..f58cf01ab37 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
@@ -87,6 +87,12 @@ public class ConnectionManager implements Watcher {
         }
         
       }, (long) (client.getZkClientTimeout() * 0.90));
+      if (isClosed) {
+        // we might have closed after getting by isClosed
+        // and before starting the new timer
+        disconnectedTimer.cancel();
+        disconnectedTimer = null;
+      }
     }
     connected = false;
     notifyAll();