diff --git a/app/build.gradle b/app/build.gradle
index d6f74330..bc2adaa4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId = 'com.tutpro.baresip'
         minSdkVersion 21
         targetSdkVersion 26
-        versionCode = 11
-        versionName = '2.1.1'
+        versionCode = 12
+        versionName = '2.1.2'
         externalNativeBuild {
             cmake {
                 cFlags '-DHAVE_INTTYPES_H'
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index c55fb1ac..085b5ab0 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -605,6 +605,12 @@ class MainActivity : AppCompatActivity() {
                             }
                         }
                         if (calls.size == 0) am.mode = AudioManager.MODE_NORMAL
+                        if (am.isSpeakerphoneOn) {
+                            am.isSpeakerphoneOn = false
+                            val speakerIcon = findViewById(R.id.speakerIcon) as ActionMenuItemView
+                            speakerIcon.setBackgroundColor(ContextCompat.getColor(applicationContext,
+                                    R.color.colorPrimary))
+                        }
                     }
                     "message" -> {
                         val peer_uri = params[1]