diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index 1e8ed346..0cf64998 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
@@ -153,6 +153,8 @@ public class MainActivity extends AppCompatActivity
 
         else if(id == R.id.nav_logout){
             UtilitySettings.logout();
+            ServerStatusChecker.dispose();
+
             startLoginActivity();
         }
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
index ba5048c4..79df7b92 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java
@@ -35,8 +35,6 @@ public class AppContext {
 
         this.initCrashlytics();
 
-        this.initServerStatusChecker();
-
         this.initBarcode();
 
         this.initUtilities();
@@ -67,10 +65,6 @@ public class AppContext {
         }
     }
 
-    private void initServerStatusChecker() {
-        ServerStatusChecker.init();
-    }
-
     private void initBarcode() {
         BarcodeManager.init(mContext);
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
index 092790c2..7aa4148c 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java
@@ -6,6 +6,7 @@ import android.text.SpannableString;
 import java.lang.reflect.Method;
 
 import androidx.appcompat.app.AppCompatActivity;
+import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.class_router.ClassRouter;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
@@ -26,9 +27,15 @@ public class MainContext {
         });
 
         this.initReflections();
+
+        this.initServerStatusChecker();
     }
 
 
+    private void initServerStatusChecker() {
+        ServerStatusChecker.init();
+    }
+
     private void initDBData(Runnable onComplete) {
         SettingsManager.loadDBVariables(onComplete, ex -> {
                     DialogSimpleMessageHelper.makeErrorDialog(mContext,