diff --git a/app/src/main/kotlin/com/tutpro/baresip/Call.kt b/app/src/main/kotlin/com/tutpro/baresip/Call.kt
index 7611ead4..76fe5e90 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/Call.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/Call.kt
@@ -39,14 +39,15 @@ class Call(val callp: Long, val ua: UserAgent, val peerUri: String, val dir: Str
         val err = Api.call_hold(callp, true)
         if (err != 0)
             return false
+        onhold = true
         referTo = uri
         return Api.call_transfer(callp, uri) == 0
     }
 
     fun executeTransfer(): Boolean {
-        return if (this.onHoldCall != null) {
+        return if (onHoldCall != null) {
             if (Api.call_hold(callp, true) == 0)
-                Api.call_replace_transfer(this.onHoldCall!!.callp, callp)
+                Api.call_replace_transfer(onHoldCall!!.callp, callp)
             else
                 false
         } else
diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
index d47c10ba..1a541a4f 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainScreen.kt
@@ -1385,7 +1385,7 @@ private fun CallRow(ctx: Context, viewModel: ViewModel) {
                     abandonAudioFocus(ctx)
                     val uaCalls = ua.calls()
                     if (uaCalls.isNotEmpty()) {
-                        val call = uaCalls.last()
+                        val call = uaCalls.first()
                         val callp = call.callp
                         Log.d(TAG, "AoR ${ua.account.aor} hanging up call $callp with ${callUri.value}")
                         Api.ua_hangup(ua.uap, callp, 0, "")