diff --git a/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
index a0919f22..9641be34 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/SettingsScreen.kt
@@ -1148,7 +1148,10 @@ private fun SettingsContent(
             val debug by viewModel.debug.collectAsState()
             Switch(
                 checked = debug,
-                onCheckedChange = { viewModel.debug.value = it }
+                onCheckedChange = {
+                    viewModel.debug.value = it
+                    if (!it) viewModel.sipTrace.value = false
+                }
             )
         }
     }
@@ -1158,7 +1161,7 @@ private fun SettingsContent(
         val sipTraceTitle = stringResource(R.string.sip_trace)
         val sipTraceHelp = stringResource(R.string.sip_trace_help)
         Row(
-            Modifier.fillMaxWidth().padding(end = 10.dp),
+            Modifier.fillMaxWidth().padding(start = 16.dp, end = 10.dp),
             verticalAlignment = Alignment.CenterVertically,
             horizontalArrangement = Arrangement.Start
         ) {
@@ -1258,7 +1261,9 @@ private fun SettingsContent(
         ColorBlind()
         ProximitySensing()
         Debug()
-        SipTrace()
+        val debug by viewModel.debug.collectAsState()
+        if (debug)
+            SipTrace()
         Reset(onRestartApp)
     }
 }
@@ -1413,7 +1418,7 @@ private fun checkOnClick(ctx: Context, viewModel: SettingsViewModel): Boolean {
         save = true
     }
 
-    val sipTrace = viewModel.sipTrace.value
+    val sipTrace = if (debug) viewModel.sipTrace.value else false
     if (BaresipService.sipTrace != sipTrace) {
         BaresipService.sipTrace = sipTrace
         Api.uag_enable_sip_trace(sipTrace)