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 c429263631f..ec878299c16 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
@@ -2648,7 +2648,7 @@ MasterServices, Server {
       Collection<HTableDescriptor> descriptors = this.tableDescriptors.getAll().values();
       GetTableNamesResponse.Builder builder = GetTableNamesResponse.newBuilder();
       for (HTableDescriptor descriptor: descriptors) {
-        if (descriptor.isMetaTable()) {
+        if (descriptor.getTableName().isSystemTable()) {
           continue;
         }
         builder.addTableNames(ProtobufUtil.toProtoTableName(descriptor.getTableName()));