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 47a0a9b6aa6..ceccfff898e 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
@@ -3178,6 +3178,7 @@ public class AssignmentManager extends ZooKeeperListener {
   }
 
   public void stop() {
+    shutdown(); // Stop executor service, etc
     if (tomActivated){
       this.timeoutMonitor.interrupt();
       this.timerUpdater.interrupt();