diff --git a/src/java/org/apache/hadoop/hbase/master/ZKMasterAddressWatcher.java b/src/java/org/apache/hadoop/hbase/master/ZKMasterAddressWatcher.java
index 49f783dfc87..fccf46d9389 100644
--- a/src/java/org/apache/hadoop/hbase/master/ZKMasterAddressWatcher.java
+++ b/src/java/org/apache/hadoop/hbase/master/ZKMasterAddressWatcher.java
@@ -110,6 +110,7 @@ class ZKMasterAddressWatcher implements Watcher {
       }
       if(this.zookeeper.writeMasterAddress(address)) {
         this.zookeeper.setClusterState(true);
+        this.zookeeper.setClusterStateWatch(this);
         // Watch our own node
         this.zookeeper.readMasterAddress(this);
         return true;