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 38dec34b7c1..73683097e03 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
@@ -186,9 +186,9 @@ public class AssignmentManager extends ZooKeeperListener {
                            (new HashMap<String, HRegionInfo> ());
     Configuration conf = server.getConfiguration();
     this.timeoutMonitor = new TimeoutMonitor(
-      conf.getInt("hbase.master.assignment.timeoutmonitor.period", 60000),
+      conf.getInt("hbase.master.assignment.timeoutmonitor.period", 30000),
       server, serverManager,
-      conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", 1200000));
+      conf.getInt("hbase.master.assignment.timeoutmonitor.timeout", 600000));
     this.timerUpdater = new TimerUpdater(conf.getInt(
       "hbase.master.assignment.timerupdater.period", 10000), server);
     Threads.setDaemonThreadRunning(timerUpdater.getThread(),