diff --git a/Linphone/view/Control/Display/Contact/ContactListView.qml b/Linphone/view/Control/Display/Contact/ContactListView.qml
index 5e0532b1c..3c11507cb 100644
--- a/Linphone/view/Control/Display/Contact/ContactListView.qml
+++ b/Linphone/view/Control/Display/Contact/ContactListView.qml
@@ -252,6 +252,7 @@ ListView {
 						icon.source: AppIcons.chatTeardropText
 						focus: visible && !callButton.visible
 						contentImageColor: DefaultStyle.main2_500main
+						visible: !SettingsCpp.disableChatFeature
 						background: Rectangle {
 							anchors.fill: parent
 							radius: 40 * DefaultStyle.dp
diff --git a/Linphone/view/Page/Layout/Main/MainLayout.qml b/Linphone/view/Page/Layout/Main/MainLayout.qml
index ddd81090e..cd3a28a3e 100644
--- a/Linphone/view/Page/Layout/Main/MainLayout.qml
+++ b/Linphone/view/Page/Layout/Main/MainLayout.qml
@@ -366,8 +366,7 @@ Item {
 											}
 											MagicSearchButton {
 												id: chatButton
-												// TODO : visible true when chat available
-												// visible: false
+												visible: !SettingsCpp.disableChatFeature
 												Layout.preferredWidth: 45 * DefaultStyle.dp
 												Layout.preferredHeight: 45 * DefaultStyle.dp
 												icon.source: AppIcons.chatTeardropText