diff --git a/src/app/constant/JamiStrings.qml b/src/app/constant/JamiStrings.qml
index 4c4b85dcac83a464a688f2e0c2d8e1db233f150e..7fa26432c4d25862bc902ad1913f73ee1209a2c6 100644
--- a/src/app/constant/JamiStrings.qml
+++ b/src/app/constant/JamiStrings.qml
@@ -231,7 +231,6 @@ Item {
     property string isCallingYou: qsTr("is calling you")
     property string mute: qsTr("Mute")
     property string unmute: qsTr("Unmute")
-    property string hangup: qsTr("End call")
     property string pauseCall: qsTr("Pause call")
     property string resumeCall: qsTr("Resume call")
     property string muteCamera: qsTr("Mute camera")
diff --git a/src/app/mainview/components/CallActionBar.qml b/src/app/mainview/components/CallActionBar.qml
index 12503cddfa0c20cc4cc4f360da2de9e710cb0fb8..5976003b0512d63bd70ace2b7ede5163c0b15d77 100644
--- a/src/app/mainview/components/CallActionBar.qml
+++ b/src/app/mainview/components/CallActionBar.qml
@@ -276,7 +276,7 @@ Control {
             onTriggered: CallAdapter.hangUpThisCall()
             icon.source: JamiResources.ic_call_end_white_24dp_svg
             icon.color: "white"
-            text: JamiStrings.hangup
+            text: JamiStrings.endCall
             property bool hasBg: true
         },
         Action {
diff --git a/src/app/mainview/components/ConversationListView.qml b/src/app/mainview/components/ConversationListView.qml
index 363dff5d02e4ff61bf698d81e9583b7d15399cd9..e21af2b32425c8f6b9e17cb91041cbdeaca0148a 100644
--- a/src/app/mainview/components/ConversationListView.qml
+++ b/src/app/mainview/components/ConversationListView.qml
@@ -127,6 +127,8 @@ JamiListView {
                     (model.dataForRow(index, ConversationList.ContactType) !==
                                                    Profile.Type.TEMPORARY) &&
                     CurrentAccount.type !== Profile.Type.SIP
+            hasCall = UtilsAdapter.getCallId(responsibleAccountId,
+                                          responsibleConvUid) !== ""
 
             // For UserProfile dialog.
             if (isCoreDialog) {
diff --git a/src/app/mainview/components/ConversationSmartListContextMenu.qml b/src/app/mainview/components/ConversationSmartListContextMenu.qml
index 291c8b5786cfcf17d02a5a4212410439ec21a92c..f8de8a08b9c6dbe803a029ff7e45a41e1493927c 100644
--- a/src/app/mainview/components/ConversationSmartListContextMenu.qml
+++ b/src/app/mainview/components/ConversationSmartListContextMenu.qml
@@ -36,13 +36,8 @@ ContextMenuAutoLoader {
     property var isCoreDialog: undefined
     property var mode: undefined
     property int contactType: Profile.Type.INVALID
-    property bool hasCall: {
-        if (responsibleAccountId && responsibleConvUid)
-            return UtilsAdapter.getCallId(responsibleAccountId,
-                                          responsibleConvUid) !== ""
-        return false
-    }
-    property bool readOnly
+    property bool hasCall: false
+    property bool readOnly: false
 
     // For UserProfile dialog.
     property string aliasText
@@ -117,7 +112,7 @@ ContextMenuAutoLoader {
             id: hangup
 
             canTrigger: hasCall
-            itemName: JamiStrings.hangup
+            itemName: JamiStrings.endCall
             iconSource: JamiResources.ic_call_end_white_24dp_svg
             addMenuSeparatorAfter: contactType !== Profile.Type.SIP
                                    && (contactType === Profile.Type.PENDING