diff --git a/services/src/main/java/io/druid/cli/CliPeon.java b/services/src/main/java/io/druid/cli/CliPeon.java
index 4b5728b4c75..b51d468945f 100644
--- a/services/src/main/java/io/druid/cli/CliPeon.java
+++ b/services/src/main/java/io/druid/cli/CliPeon.java
@@ -223,6 +223,8 @@ public class CliPeon extends GuiceRunnable
             )
         );
         injector.getInstance(ExecutorLifecycle.class).join();
+        // Explicitly call lifecycle stop, dont rely on shutdown hook.
+        lifecycle.stop();
       }
       catch (Throwable t) {
         log.error(t, "Error when starting up.  Failing.");