diff --git a/ui/src/main/java/com/wireguard/android/activity/MainActivity.java b/ui/src/main/java/com/wireguard/android/activity/MainActivity.java
index 71a70d4..46999c3 100644
--- a/ui/src/main/java/com/wireguard/android/activity/MainActivity.java
+++ b/ui/src/main/java/com/wireguard/android/activity/MainActivity.java
@@ -27,13 +27,13 @@ public class MainActivity extends AppCompatActivity {
         mainViewModel = new ViewModelProvider(this).get(MainViewModel.class);
         if (mainViewModel.isUserLoggedIn(this)) {
             setContentView(R.layout.activity_main);
+            mainViewModel.buildRepositoryInstance(this, mainViewModel.getUserURL(this));
+            initUI();
         } else {
             Intent intent = new Intent(this, LoginActivity.class);
             startActivity(intent);
             finish();
         }
-        mainViewModel.buildRepositoryInstance(this, mainViewModel.getUserURL(this));
-        initUI();
     }
 
     @Override protected void onResume() {
diff --git a/ui/src/main/java/com/wireguard/android/repository/DataRepository.java b/ui/src/main/java/com/wireguard/android/repository/DataRepository.java
index 9431ac4..4796a06 100644
--- a/ui/src/main/java/com/wireguard/android/repository/DataRepository.java
+++ b/ui/src/main/java/com/wireguard/android/repository/DataRepository.java
@@ -321,7 +321,9 @@ public class DataRepository {
     }
 
     public void clearDisposable() {
-        compositeDisposable.clear();
+        if(compositeDisposable!=null) {
+            compositeDisposable.clear();
+        }
     }