diff --git a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java
index f382be10cfb..070c51425d5 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java
@@ -632,7 +632,7 @@ private void requestTabletHosting(ClientContext context,
     }
 
     // System tables should always be hosted
-    if (AccumuloTable.ROOT.tableId() == tableId || AccumuloTable.METADATA.tableId() == tableId) {
+    if (AccumuloTable.allTableIds().contains(tableId)) {
       return;
     }