diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index ba5d669aa42..0b4ae75904f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -819,7 +819,7 @@ public class HRegionServer extends HasThread implements
     blockAndCheckIfStopped(this.clusterStatusTracker);
 
     if (this.initLatch != null) {
-      this.initLatch.await(50, TimeUnit.SECONDS);
+      this.initLatch.await(20, TimeUnit.SECONDS);
     }
     // Retrieve clusterId
     // Since cluster status is now up