1 files changed, 4 insertions, 5 deletions
diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java
index eb7433f83dc..76ac6a16605 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -126,6 +126,10 @@ public class App implements ProcessMXBean {
 
   @Override
   public void terminate() {
+    if (monitor != null && monitor.isAlive()) {
+      monitor.terminate();
+      monitor = null;
+    }
     if (server != null) {
       server.terminate();
       server = null;
@@ -134,11 +138,6 @@ public class App implements ProcessMXBean {
       elasticsearch.terminate();
       elasticsearch = null;
     }
-    if (monitor != null && monitor.isAlive()) {
-      monitor.terminate();
-      monitor.interrupt();
-      monitor = null;
-    }
   }
 
   private boolean isSuccess() {