diff --git a/app/src/main/kotlin/com/tutpro/baresip/AudioScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/AudioScreen.kt
index cedcf87e..394f1f05 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/AudioScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/AudioScreen.kt
@@ -638,6 +638,7 @@ private fun checkOnClick(ctx: Context): Result {
 
     if (newSpeakerPhone != oldSpeakerPhone) {
         Config.replaceVariable("speaker_phone", if (newSpeakerPhone) "yes" else "no")
+        BaresipService.speakerPhoneAuto = newSpeakerPhone
         save = true
     }
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
index 25ee61aa..8a0e4253 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
@@ -782,7 +782,7 @@ class BaresipService: Service() {
                     "call outgoing" -> {
                         if (call!!.status.value == "transferring")
                             break
-                        if (Config.variable("speaker_phone") == "yes") {
+                        if (speakerPhoneAuto) {
                             Log.d(TAG, "Auto-on speakerphone for outgoing call")
                             speakerPhone = true
                         }
@@ -792,16 +792,12 @@ class BaresipService: Service() {
                         proximitySensing(proximitySensing)
                     }
                     "call ringing" -> {
-                        if (Config.variable("speaker_phone") == "yes")
-                            speakerPhone = true
                         ConnectionService.connections[callp]?.setRinging()
                         ensureCommunicationMode()
                         playRingBack()
                         return
                     }
                     "call progress" -> {
-                        if (Config.variable("speaker_phone") == "yes")
-                            speakerPhone = true
                         ensureCommunicationMode()
                         if ((ev[1].toInt() and Api.SDP_RECVONLY) != 0)
                             stopMediaPlayer()
@@ -812,6 +808,10 @@ class BaresipService: Service() {
                         return
                     }
                     "incoming call" -> {
+                        if (speakerPhoneAuto) {
+                            Log.d(TAG, "Auto-on speakerphone for incoming call")
+                            speakerPhone = true
+                        }
                         val peerUri = ev[1]
                         val toastMsg = if (Call.isAnyCallActive(applicationContext))
                             String.format(getString(R.string.call_auto_rejected),
@@ -845,6 +845,7 @@ class BaresipService: Service() {
                                     packageName
                                 )
                                 if (resourceId != 0) {
+                                    ensureCommunicationMode()
                                     playUnInterrupted(resourceId, 1)
                                 } else {
                                     Log.e(TAG, "Callwaiting tone $name.wav not found")
@@ -861,10 +862,6 @@ class BaresipService: Service() {
                         return
                     }
                     "call incoming" -> {
-                        if (Config.variable("speaker_phone") == "yes") {
-                            Log.d(TAG, "Auto-on speakerphone for incoming call")
-                            speakerPhone = true
-                        }
                         val peerUri = ev[1]
                         Log.d(TAG, "Incoming call $uap/$callp/$peerUri")
                         if (Call.ofCallp(callp) == null)
@@ -881,8 +878,6 @@ class BaresipService: Service() {
                         return
                     }
                     "call answered" -> {
-                        if (Config.variable("speaker_phone") == "yes")
-                            speakerPhone = true
                         stopMediaPlayer()
                         ensureCommunicationMode()
                         if (call!!.status.value == "incoming")
@@ -894,8 +889,6 @@ class BaresipService: Service() {
                         stopMediaPlayer()
                     }
                     "call established" -> {
-                        if (Config.variable("speaker_phone") == "yes")
-                            speakerPhone = true
                         ConnectionService.connections[callp]?.setActive()
                         ensureCommunicationMode()
                         nm.cancel(CALL_NOTIFICATION_ID)
@@ -2258,6 +2251,7 @@ class BaresipService: Service() {
         var callVolume = 0
         @Volatile
         var speakerPhone = false
+        var speakerPhoneAuto = false
         var audioDelay = if (VERSION.SDK_INT < 31) 1500L else 500L
         var dynDns = false
         var filesPath = ""
diff --git a/app/src/main/kotlin/com/tutpro/baresip/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
index 492afb96..189aefb5 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Config.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Config.kt
@@ -177,8 +177,11 @@ object Config {
         val speakerPhone = previousVariable("speaker_phone")
         if (speakerPhone != "") {
             config = "${config}speaker_phone $speakerPhone\n"
-        } else {
+            BaresipService.speakerPhoneAuto = speakerPhone == "yes"
+        }
+        else {
             config = "${config}speaker_phone no\n"
+            BaresipService.speakerPhoneAuto = false
         }
         BaresipService.speakerPhone = false
 
diff --git a/app/src/main/kotlin/com/tutpro/baresip/ConnectionService.kt b/app/src/main/kotlin/com/tutpro/baresip/ConnectionService.kt
index b91e291b..5d54d0d4 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ConnectionService.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ConnectionService.kt
@@ -70,7 +70,7 @@ class ConnectionService : ConnectionService() {
 
         val ua = UserAgent.ofUap(uap)
         if (ua != null) {
-            if (BaresipService.speakerPhone || Config.variable("speaker_phone") == "yes") {
+            if (BaresipService.speakerPhone || BaresipService.speakerPhoneAuto) {
                 BaresipService.speakerPhone = true
                 @Suppress("DEPRECATION")
                 connection.setAudioRoute(CallAudioState.ROUTE_SPEAKER)
@@ -122,7 +122,7 @@ class ConnectionService : ConnectionService() {
         val connection = BaresipConnection(uap, 0L)
         pendingOutgoingConnection = connection
 
-        if (BaresipService.speakerPhone || Config.variable("speaker_phone") == "yes") {
+        if (BaresipService.speakerPhone || BaresipService.speakerPhoneAuto) {
             BaresipService.speakerPhone = true
             @Suppress("DEPRECATION")
             connection.setAudioRoute(CallAudioState.ROUTE_SPEAKER)