diff --git a/governator-legacy/src/main/java/com/netflix/governator/lifecycle/LifecycleManager.java b/governator-legacy/src/main/java/com/netflix/governator/lifecycle/LifecycleManager.java
index 06367560..24f949b9 100644
--- a/governator-legacy/src/main/java/com/netflix/governator/lifecycle/LifecycleManager.java
+++ b/governator-legacy/src/main/java/com/netflix/governator/lifecycle/LifecycleManager.java
@@ -231,6 +231,12 @@ public synchronized void close()
             try
             {
                 stopInstances();
+
+                WarmUpSession session = postStartWarmUpSession.get();
+                if (session != null)
+                {
+                    session.close();
+                }
             }
             catch ( Exception e )
             {
diff --git a/governator-legacy/src/main/java/com/netflix/governator/lifecycle/warmup/WarmUpSession.java b/governator-legacy/src/main/java/com/netflix/governator/lifecycle/warmup/WarmUpSession.java
index 98def943..7d49c0ec 100644
--- a/governator-legacy/src/main/java/com/netflix/governator/lifecycle/warmup/WarmUpSession.java
+++ b/governator-legacy/src/main/java/com/netflix/governator/lifecycle/warmup/WarmUpSession.java
@@ -102,4 +102,10 @@ protected void compute()
             }
         };
     }
+
+
+    public void close()
+    {
+        forkJoinPool.shutdownNow();
+    }
 }