diff --git a/src/main/java/JettyLauncher.java b/src/main/java/JettyLauncher.java
index 7eaecd929..443954c7b 100644
--- a/src/main/java/JettyLauncher.java
+++ b/src/main/java/JettyLauncher.java
@@ -60,6 +60,8 @@ public class JettyLauncher {
         }
 
         server.setHandler(context);
+        server.setStopAtShutdown(true);
+        server.setStopTimeout(7_000);
         server.start();
         server.join();
     }