diff --git a/proxyserver/src/main/java/com/lyft/data/proxyserver/ProxyServer.java b/proxyserver/src/main/java/com/lyft/data/proxyserver/ProxyServer.java
index 8706b019..b8d0fd2a 100644
--- a/proxyserver/src/main/java/com/lyft/data/proxyserver/ProxyServer.java
+++ b/proxyserver/src/main/java/com/lyft/data/proxyserver/ProxyServer.java
@@ -170,6 +170,7 @@ public void start() {
   public void close() {
     try {
       this.server.stop();
+      scheduler.shutdown();
     } catch (Exception e) {
       log.error("Could not close the proxy server", e);
     }