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 08de4107091f1302989ec43702294c3f4940a686..759531d2735cfd2c59e77f9dbf5c2636813269fc 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
@@ -68,8 +68,8 @@ public class Server {
     public static AppUpdater appUpdater;
 
     public Server(AppUpdater appUpdater) {
-        main(new String[]{});
         Server.appUpdater = appUpdater;
+        main(new String[]{});
     }
 
 
diff --git a/updater/src/main/java/net/jami/jams/updater/UpdateDownloader.java b/updater/src/main/java/net/jami/jams/updater/UpdateDownloader.java
index 10b130ad1059973e21ed396fa8b3af7dafd38828..76785db933d7f7694c30ff324d46f939344ded63 100644
--- a/updater/src/main/java/net/jami/jams/updater/UpdateDownloader.java
+++ b/updater/src/main/java/net/jami/jams/updater/UpdateDownloader.java
@@ -11,7 +11,6 @@ import org.apache.http.impl.client.HttpClients;
 import org.apache.http.ssl.SSLContexts;
 
 import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSocketFactory;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.InputStream;