diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
index ecd4a7dc41e..6e3461873ea 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/TableStateManager.java
@@ -233,6 +233,7 @@ public class TableStateManager {
     try {
       MetaTableAccessor.updateTableState(master.getConnection(), tableName, newState);
       tableName2State.put(tableName, newState);
+      succ = true;
     } finally {
       if (!succ) {
         tableName2State.remove(tableName);