diff --git a/jams-launcher/src/main/java/launcher/AppStarter.java b/jams-launcher/src/main/java/launcher/AppStarter.java
index 51c89bfcd07827ab3bdd1ed6af155240f2f5f250..d19d7dd1f502cea4b87c64740143b68ac9fccdf6 100644
--- a/jams-launcher/src/main/java/launcher/AppStarter.java
+++ b/jams-launcher/src/main/java/launcher/AppStarter.java
@@ -87,7 +87,6 @@ public class AppStarter extends Thread {
                 }
                 if(doUpdate.get()){
                     Server.tomcatLauncher.stopTomcat();
-                    server = null;
                     //This will trigger a force reload of the lib.
                     LibraryLoader.loadlibs(System.getProperty("user.dir"), AppStarter.class);
                     server = ServerLoader.loadServer(appUpdater, Integer.toString(port), serverCertificate, serverPrivateKey);
diff --git a/jams-server/src/main/java/net/jami/jams/server/Server.java b/jams-server/src/main/java/net/jami/jams/server/Server.java
index 34e3f1a89509940fb2566e06e181551cca770962..a740c7519042385e4682b6bb88b98500ca8e5fb3 100644
--- a/jams-server/src/main/java/net/jami/jams/server/Server.java
+++ b/jams-server/src/main/java/net/jami/jams/server/Server.java
@@ -55,7 +55,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
 
 @Slf4j
 //In order to make this "stoppable" to simply, I turned the server itself into a thread.
-//The reasoning: the main two problems
 public class Server {
 
     public final static AtomicBoolean isInstalled = new AtomicBoolean(false);
diff --git a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
index 9ece9ab4cd0838fcc8bc9bee04076b29576e8e6b..06461326b1312b72155dc6d0460ff37f7f25632f 100644
--- a/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
+++ b/jams-server/src/main/java/net/jami/jams/server/core/TomcatLauncher.java
@@ -52,8 +52,8 @@ import static net.jami.jams.server.Server.certificateAuthority;
 @Slf4j
 public class TomcatLauncher {
 
-    private static final Tomcat tomcat = new Tomcat();
-    private static StandardContext context;
+    private final Tomcat tomcat = new Tomcat();
+    private StandardContext context;
 
     public TomcatLauncher(int port) {
         tomcat.getService().addConnector(TomcatConnectorFactory.getNoSSLConnector(port));