diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
index 844bf6e9b5e..bb8b6911745 100644
--- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
+++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HBaseAdmin.java
@@ -2023,11 +2023,15 @@ public class HBaseAdmin implements Abortable, Closeable {
       return HRegionInfo.FIRST_META_REGIONINFO.getRegionName();
     }
     CatalogTracker ct = getCatalogTracker();
-    Pair<HRegionInfo, ServerName> regionServerPair
-      = getRegion(regionNameOrEncodedRegionName, ct);
     byte[] tmp = regionNameOrEncodedRegionName;
-    if (regionServerPair != null && regionServerPair.getFirst() != null) {
-      tmp = regionServerPair.getFirst().getRegionName();
+    try {
+      Pair<HRegionInfo, ServerName> regionServerPair
+        = getRegion(regionNameOrEncodedRegionName, ct);
+      if (regionServerPair != null && regionServerPair.getFirst() != null) {
+        tmp = regionServerPair.getFirst().getRegionName();
+      }
+    } finally {
+      cleanupCatalogTracker(ct);
     }
     return tmp;
   }