diff --git a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainActivity.kt b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainActivity.kt
index 41030df373..443e28d47a 100644
--- a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainActivity.kt
+++ b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainActivity.kt
@@ -71,11 +71,6 @@ class MainActivity : ComponentActivity() {
                     ) {
                         viewModel.setUiConnected()
                     }
-                    if (proxyState == NymProxy.Companion.State.DISCONNECTED &&
-                        workState != WorkInfo.State.RUNNING
-                    ) {
-                        viewModel.setUiDisconnected()
-                    }
                 }
             }
 
diff --git a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainViewModel.kt b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainViewModel.kt
index 9d8112c7e5..56591a6904 100644
--- a/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainViewModel.kt
+++ b/nym-connect/native/android/app/src/main/java/net/nymtech/nyms5/MainViewModel.kt
@@ -10,7 +10,6 @@ import androidx.work.NetworkType
 import androidx.work.OneTimeWorkRequest
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.OutOfQuotaPolicy
-import androidx.work.WorkInfo
 import androidx.work.WorkManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.delay
@@ -49,7 +48,7 @@ class MainViewModel(
     val uiState: StateFlow<ProxyState> = _uiState.asStateFlow()
 
     fun setUiConnected() {
-        Log.d(tag, "_____setUiConnected")
+        Log.d(tag, "____setUiConnected")
         _uiState.update { currentState ->
             currentState.copy(
                 connected = true,
@@ -59,7 +58,7 @@ class MainViewModel(
     }
 
     fun setUiDisconnected() {
-        Log.d(tag, "_____setUiDisconnected")
+        Log.d(tag, "____setUiDisconnected")
         _uiState.update { currentState ->
             currentState.copy(
                 connected = false,
diff --git a/sdk/lib/socks5-listener/src/lib.rs b/sdk/lib/socks5-listener/src/lib.rs
index aea3aed26f..9cc2f9d45d 100644
--- a/sdk/lib/socks5-listener/src/lib.rs
+++ b/sdk/lib/socks5-listener/src/lib.rs
@@ -178,10 +178,10 @@ pub fn blocking_run_client<'cb, F, S>(
             }
             let mut guard = LAST_PING.lock().await;
             let Some(last_ping) = *guard else {
-                    warn!("client has not been pinged yet - shutting down");
-                    *guard = None;
-                    stop_and_reset_shutdown_handle().await;
-                    break;
+               warn!("client has not been pinged yet - shutting down");
+               *guard = None;
+               stop_and_reset_shutdown_handle().await;
+               break;
             };
             if last_ping.elapsed() > Duration::from_secs(10) {
                 warn!("client has not been pinged for more than 10 seconds - shutting down");