diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
index ef49f99d94a3..04294b0c8ac8 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/AssignmentManager.java
@@ -4767,6 +4767,10 @@ void setRegionStateListener(RegionStateListener listener) {
     this.regionStateListener = listener;
   }
 
+  public boolean isTableEnabled(final TableName tableName) {
+    return getTableStateManager().isTableState(tableName, ZooKeeperProtos.Table.State.ENABLED);
+  }
+
   private class DelayedAssignCallable implements Runnable {
 
     Callable<?> callable;
diff --git a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
index e0d8dda65510..3ad73c39411a 100644
--- a/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
+++ b/hbase-server/src/main/resources/hbase-webapps/master/table.jsp
@@ -289,24 +289,26 @@ if ( fqtn != null ) {
   </tr>
   <tr>
       <td>Enabled</td>
-      <td><%= admin.isTableEnabled(table.getName()) %></td>
+      <td><%= master.getAssignmentManager().isTableEnabled(table.getName()) %></td>
       <td>Is the table enabled</td>
   </tr>
   <tr>
       <td>Compaction</td>
       <td>
 <%
-  try {
-    CompactionState compactionState = admin.getCompactionState(table.getName());
-%>
-<%= compactionState %>
-<%
-  } catch (Exception e) {
-    // Nothing really to do here
-    for(StackTraceElement element : e.getStackTrace()) {
-      %><%= StringEscapeUtils.escapeHtml(element.toString()) %><%
+  if (master.getAssignmentManager().isTableEnabled(table.getName())) {
+    try {
+      CompactionState compactionState = admin.getCompactionState(table.getName());
+      %><%= compactionState %><%
+    } catch (Exception e) {
+      // Nothing really to do here
+      for(StackTraceElement element : e.getStackTrace()) {
+        %><%= StringEscapeUtils.escapeHtml(element.toString()) %><%
+      }
+      %> Unknown <%
     }
-%> Unknown <%
+  } else {
+    %><%= CompactionState.NONE %><%
   }
 %>
       </td>