diff --git a/app/src/main/assets/config b/app/src/main/assets/config
index 3d954de3..00cd52c2 100644
--- a/app/src/main/assets/config
+++ b/app/src/main/assets/config
@@ -10,14 +10,12 @@ audio_source opensles,nil
 audio_alert opensles,nil
 audio_level no
 audio_buffer_mode adaptive
-audio_buffer 40-200
 ausrc_format s16
 auenc_format s16
 auplay_format s16
 audec_format s16
 rtp_tos 184
 jitter_buffer_type adaptive
-jitter_buffer_delay 5-10
 rtp_stats yes
 dyn_dns yes
 module opus.so
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
index 52e81665..491e8663 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
@@ -91,17 +91,16 @@ object Config {
             }
         }
 
-        if (!config.contains("audio_buffer_mode")) {
+        if (!config.contains("audio_buffer_mode"))
             config = "${config}audio_buffer_mode adaptive\n"
-            config = "${config}audio_buffer 40-200\n"
-        }
 
-        if (!config.contains("jitter_buffer_type")) {
+        removeVariable("audio_buffer")  // use default 20-160
+
+        if (!config.contains("jitter_buffer_type"))
             config = "${config}jitter_buffer_type adaptive\n"
-        } else {
-            removeVariable("jitter_buffer_wish")
-        }
-        
+
+        removeVariable("jitter_buffer_delay")  // use default 5-10
+
         if (config.contains("contacts_mode")) {
             BaresipService.contactsMode = variable("contacts_mode")[0].lowercase()
             if (BaresipService.contactsMode != "baresip" &&