diff --git a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt
index 5898ccb657..61c8e1b75f 100644
--- a/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt
+++ b/apps/multiplatform/common/src/commonMain/kotlin/chat/simplex/common/views/usersettings/NetworkAndServers.kt
@@ -28,6 +28,7 @@ import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import chat.simplex.common.model.*
+import chat.simplex.common.model.ChatModel.controller
 import chat.simplex.common.platform.*
 import chat.simplex.common.ui.theme.*
 import chat.simplex.common.views.chat.item.ClickableText
@@ -58,6 +59,8 @@ fun NetworkAndServersView() {
     smpProxyFallback = smpProxyFallback,
     proxyPort = proxyPort,
     toggleSocksProxy = { enable ->
+      val def = NetCfg.defaults
+      val proxyDef = NetCfg.proxyDefaults
       if (enable) {
         AlertManager.shared.showAlertDialog(
           title = generalGetString(MR.strings.network_enable_socks),
@@ -65,7 +68,19 @@ fun NetworkAndServersView() {
           confirmText = generalGetString(MR.strings.confirm_verb),
           onConfirm = {
             withBGApi {
-              val conf = NetCfg.proxyDefaults.withHostPort(chatModel.controller.appPrefs.networkProxyHostPort.get())
+              var conf = controller.getNetCfg().withHostPort(controller.appPrefs.networkProxyHostPort.get())
+              if (conf.tcpConnectTimeout == def.tcpConnectTimeout) {
+                conf = conf.copy(tcpConnectTimeout = proxyDef.tcpConnectTimeout)
+              }
+              if (conf.tcpTimeout == def.tcpTimeout) {
+                conf = conf.copy(tcpTimeout = proxyDef.tcpTimeout)
+              }
+              if (conf.tcpTimeoutPerKb == def.tcpTimeoutPerKb) {
+                conf = conf.copy(tcpTimeoutPerKb = proxyDef.tcpTimeoutPerKb)
+              }
+              if (conf.rcvConcurrency == def.rcvConcurrency) {
+                conf = conf.copy(rcvConcurrency = proxyDef.rcvConcurrency)
+              }
               chatModel.controller.apiSetNetworkConfig(conf)
               chatModel.controller.setNetCfg(conf)
               networkUseSocksProxy.value = true
@@ -80,7 +95,19 @@ fun NetworkAndServersView() {
           confirmText = generalGetString(MR.strings.confirm_verb),
           onConfirm = {
             withBGApi {
-              val conf = NetCfg.defaults
+              var conf = controller.getNetCfg().copy(socksProxy = null)
+              if (conf.tcpConnectTimeout == proxyDef.tcpConnectTimeout) {
+                conf = conf.copy(tcpConnectTimeout = def.tcpConnectTimeout)
+              }
+              if (conf.tcpTimeout == proxyDef.tcpTimeout) {
+                conf = conf.copy(tcpTimeout = def.tcpTimeout)
+              }
+              if (conf.tcpTimeoutPerKb == proxyDef.tcpTimeoutPerKb) {
+                conf = conf.copy(tcpTimeoutPerKb = def.tcpTimeoutPerKb)
+              }
+              if (conf.rcvConcurrency == proxyDef.rcvConcurrency) {
+                conf = conf.copy(rcvConcurrency = def.rcvConcurrency)
+              }
               chatModel.controller.apiSetNetworkConfig(conf)
               chatModel.controller.setNetCfg(conf)
               networkUseSocksProxy.value = false