diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
index 092a17d84c1..7fcda15e726 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/handler/DeleteTableHandler.java
@@ -128,12 +128,13 @@ public class DeleteTableHandler extends TableEventHandler {
     LOG.debug("Removing '" + tableName + "' from region states.");
     am.getRegionStates().tableDeleted(tableName);
 
-    // 5. If entry for this table states, remove it.
+
+    // 5.Clean any remaining rows for this table.
+    cleanAnyRemainingRows();
+
+    // 6. If entry for this table states, remove it.
     LOG.debug("Marking '" + tableName + "' as deleted.");
     am.getTableStateManager().setDeletedTable(tableName);
-
-    // 6.Clean any remaining rows for this table.
-    cleanAnyRemainingRows();
   }
 
   /**