diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index 01bde4392..eef84074f 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -820,6 +820,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
 
     @Deprecated("Deprecated in Java")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        chatSendingViewModel.attachFilePending.value = false
         if (resultCode == Activity.RESULT_OK) {
             lifecycleScope.launch {
                 withContext(Dispatchers.Main) {
@@ -1126,6 +1127,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
     }
 
     private fun pickFile() {
+        chatSendingViewModel.attachFilePending.value = true
         val intentsList = ArrayList<Intent>()
 
         val pickerIntent = Intent(Intent.ACTION_GET_CONTENT)
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
index 2a045b809..f4459b574 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
@@ -60,6 +60,8 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
 
     val attachFileEnabled = MutableLiveData<Boolean>()
 
+    val attachFilePending = MutableLiveData<Boolean>()
+
     val sendMessageEnabled = MutableLiveData<Boolean>()
 
     val attachingFileInProgress = MutableLiveData<Boolean>()
diff --git a/app/src/main/res/layout/chat_room_detail_fragment.xml b/app/src/main/res/layout/chat_room_detail_fragment.xml
index e1f75ff83..1ae8971b0 100644
--- a/app/src/main/res/layout/chat_room_detail_fragment.xml
+++ b/app/src/main/res/layout/chat_room_detail_fragment.xml
@@ -246,7 +246,7 @@
                 android:layout_marginStart="@dimen/chat_message_sending_icons_margin"
                 android:layout_marginEnd="@dimen/chat_message_sending_icons_margin"
                 android:contentDescription="@string/content_description_attach_file"
-                android:enabled="@{chatSendingViewModel.attachFileEnabled}"
+                android:enabled="@{chatSendingViewModel.attachFileEnabled &amp;&amp; !chatSendingViewModel.attachFilePending}"
                 android:onClick="@{attachFileClickListener}"
                 android:paddingTop="@dimen/chat_message_sending_icons_margin"
                 android:paddingBottom="@dimen/chat_message_sending_icons_margin"