diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsScreen.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsScreen.kt
index 95831c4e30..59d52856e6 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsScreen.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsScreen.kt
@@ -23,7 +23,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
@@ -48,7 +47,6 @@ fun NetworkSettingsScreen(
         onBackPressed = navigator::navigateBack,
         isWebSocketEnabled = networkSettingsViewModel.networkSettingsState.isPersistentWebSocketConnectionEnabled,
         isEnforcedByMDM = networkSettingsViewModel.networkSettingsState.isEnforcedByMDM,
-        isWebSocketEnforcedByDefault = networkSettingsViewModel.networkSettingsState.isWebSocketEnforcedByDefault,
         setWebSocketState = { networkSettingsViewModel.setWebSocketState(it) },
     )
 }
@@ -58,7 +56,6 @@ fun NetworkSettingsScreenContent(
     onBackPressed: () -> Unit,
     isWebSocketEnabled: Boolean,
     isEnforcedByMDM: Boolean,
-    isWebSocketEnforcedByDefault: Boolean,
     setWebSocketState: (Boolean) -> Unit,
     modifier: Modifier = Modifier
 ) {
@@ -77,15 +74,12 @@ fun NetworkSettingsScreenContent(
                 .fillMaxSize()
                 .padding(internalPadding)
         ) {
-            val switchState = remember(isWebSocketEnabled, isEnforcedByMDM, isWebSocketEnforcedByDefault) {
-                when {
-                    isEnforcedByMDM -> SwitchState.TextOnly(true)
-                    isWebSocketEnforcedByDefault -> SwitchState.TextOnly(true)
-                    else -> SwitchState.Enabled(
-                        value = isWebSocketEnabled,
-                        onCheckedChange = setWebSocketState
-                    )
-                }
+            val switchState = when {
+                isEnforcedByMDM -> SwitchState.TextOnly(true)
+                else -> SwitchState.Enabled(
+                    value = isWebSocketEnabled,
+                    onCheckedChange = setWebSocketState
+                )
             }
 
             val subtitle = if (isEnforcedByMDM) {
@@ -111,7 +105,6 @@ fun PreviewNetworkSettingsScreenWebSocketEnabled() = WireTheme {
         onBackPressed = {},
         isWebSocketEnabled = true,
         isEnforcedByMDM = false,
-        isWebSocketEnforcedByDefault = false,
         setWebSocketState = {},
     )
 }
@@ -123,7 +116,6 @@ fun PreviewNetworkSettingsScreenWebSocketDisabled() = WireTheme {
         onBackPressed = {},
         isWebSocketEnabled = false,
         isEnforcedByMDM = false,
-        isWebSocketEnforcedByDefault = false,
         setWebSocketState = {},
     )
 }
@@ -135,7 +127,6 @@ fun PreviewNetworkSettingsScreenEnforcedByMDM() = WireTheme {
         onBackPressed = {},
         isWebSocketEnabled = true,
         isEnforcedByMDM = true,
-        isWebSocketEnforcedByDefault = false,
         setWebSocketState = {},
     )
 }
@@ -147,7 +138,6 @@ fun PreviewNetworkSettingsScreenEnforcedByDefault() = WireTheme {
         onBackPressed = {},
         isWebSocketEnabled = true,
         isEnforcedByMDM = false,
-        isWebSocketEnforcedByDefault = true,
         setWebSocketState = {},
     )
 }
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsState.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsState.kt
index fee37e8f17..745b3f046e 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsState.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsState.kt
@@ -21,5 +21,4 @@ package com.wire.android.ui.home.settings.appsettings.networkSettings
 data class NetworkSettingsState(
     val isPersistentWebSocketConnectionEnabled: Boolean = false,
     val isEnforcedByMDM: Boolean = false,
-    val isWebSocketEnforcedByDefault: Boolean = false
 )
diff --git a/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsViewModel.kt b/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsViewModel.kt
index 323f81b55f..9ac2eafda1 100644
--- a/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsViewModel.kt
+++ b/app/src/main/kotlin/com/wire/android/ui/home/settings/appsettings/networkSettings/NetworkSettingsViewModel.kt
@@ -18,7 +18,6 @@
 
 package com.wire.android.ui.home.settings.appsettings.networkSettings
 
-import android.content.Context
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
@@ -26,13 +25,11 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.wire.android.appLogger
 import com.wire.android.emm.ManagedConfigurationsManager
-import com.wire.android.util.isWebsocketEnabledByDefault
 import com.wire.kalium.logic.feature.session.CurrentSessionResult
 import com.wire.kalium.logic.feature.session.CurrentSessionUseCase
 import com.wire.kalium.logic.feature.user.webSocketStatus.ObservePersistentWebSocketConnectionStatusUseCase
 import com.wire.kalium.logic.feature.user.webSocketStatus.PersistPersistentWebSocketConnectionStatusUseCase
 import dagger.hilt.android.lifecycle.HiltViewModel
-import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
@@ -43,22 +40,14 @@ class NetworkSettingsViewModel
     private val observePersistentWebSocketConnectionStatus: ObservePersistentWebSocketConnectionStatusUseCase,
     private val currentSession: CurrentSessionUseCase,
     private val managedConfigurationsManager: ManagedConfigurationsManager,
-    @ApplicationContext private val context: Context
 ) : ViewModel() {
     var networkSettingsState by mutableStateOf(NetworkSettingsState())
 
     init {
-        checkWebSocketEnforcedByDefault()
         observePersistentWebSocketConnection()
         observeMDMEnforcement()
     }
 
-    private fun checkWebSocketEnforcedByDefault() {
-        networkSettingsState = networkSettingsState.copy(
-            isWebSocketEnforcedByDefault = isWebsocketEnabledByDefault(context)
-        )
-    }
-
     private fun observeMDMEnforcement() {
         viewModelScope.launch {
             managedConfigurationsManager.persistentWebSocketEnforcedByMDM.collect { isEnforced ->
diff --git a/kalium b/kalium
index 83e3c7cbf3..903be8b62e 160000
--- a/kalium
+++ b/kalium
@@ -1 +1 @@
-Subproject commit 83e3c7cbf31e7996c03f91d9740b50e480acee35
+Subproject commit 903be8b62ebc96a99a4fdcd6400033a0fd22a975