diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
index 70176662d2c..6010598e7cd 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
@@ -874,8 +874,14 @@ public class ZkStateReader implements Closeable {
   public void removeZKWatch(final String coll) {
     synchronized (this) {
       watchedCollections.remove(coll);
-      clusterState = clusterState.copyWith(Collections
-          .<String,DocCollection> singletonMap(coll, null));
+      try {
+        updateClusterState(true);
+      } catch (KeeperException e) {
+        log.error("Error updating state",e);
+      } catch (InterruptedException e) {
+        log.error("Error updating state",e);
+        Thread.currentThread().interrupt();
+      }
     }
   }