diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
index c5c86e5f482..3ba31dab0f9 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java
@@ -2436,6 +2436,12 @@ public class HMaster extends HRegionServer implements MasterServices {
    */
   public ClusterStatus getClusterStatus(EnumSet<Option> options) throws InterruptedIOException {
     ClusterStatus.Builder builder = ClusterStatus.newBuilder();
+    // given that hbase1 can't submit the request with Option,
+    // we return all information to client if the list of Option is empty.
+    if (options.isEmpty()) {
+      options = EnumSet.allOf(Option.class);
+    }
+
     for (Option opt : options) {
       switch (opt) {
         case HBASE_VERSION: builder.setHBaseVersion(VersionInfo.getVersion()); break;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientClusterStatus.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientClusterStatus.java
index 29028ec5937..2d31f98251d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientClusterStatus.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestClientClusterStatus.java
@@ -20,11 +20,10 @@ package org.apache.hadoop.hbase.client;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
-
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.ClusterStatus;
-import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.ClusterStatus.Option;
+import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HBaseTestingUtility;
 import org.apache.hadoop.hbase.MiniHBaseCluster;
 import org.apache.hadoop.hbase.ServerName;
@@ -87,23 +86,9 @@ public class TestClientClusterStatus {
 
   @Test
   public void testNone() throws Exception {
-    ClusterStatus status = ADMIN.getClusterStatus(EnumSet.noneOf(Option.class));
-    // Other cluster status info should be either null or empty.
-    Assert.assertTrue(status.getMasterCoprocessors().length == 0);
-    Assert.assertNull(status.getHBaseVersion());
-    Assert.assertTrue(status.getBackupMasters().isEmpty());
-    Assert.assertNull(status.getBalancerOn());
-    Assert.assertNull(status.getClusterId());
-    Assert.assertTrue(status.getServers().isEmpty());
-    Assert.assertTrue(status.getDeadServerNames().isEmpty());
-    Assert.assertNull(status.getMaster());
-    Assert.assertTrue(status.getBackupMasters().isEmpty());
-    Assert.assertEquals(-1, status.getMasterInfoPort());
-    // No npe thrown is expected
-    Assert.assertNotNull(status.hashCode());
-    ClusterStatus nullEqualsCheck =
-        ADMIN.getClusterStatus(EnumSet.noneOf(Option.class));
-    Assert.assertTrue(status.equals(nullEqualsCheck));
+    ClusterStatus status0 = ADMIN.getClusterStatus(EnumSet.allOf(Option.class));
+    ClusterStatus status1 = ADMIN.getClusterStatus(EnumSet.noneOf(Option.class));
+    Assert.assertEquals(status0, status1);
   }
 
   @Test