diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageContentViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageContentViewModel.kt
index c5cd9c185..cb58a8a81 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageContentViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageContentViewModel.kt
@@ -72,10 +72,14 @@ class ChatMessageContentViewModel(
             offset: Int,
             total: Int
         ) {
-            val percent = offset * 100 / total
-            if (!c.filePath.isNullOrEmpty() && !content.filePath.isNullOrEmpty() && c.filePath == content.filePath) {
+            if (c.filePath == content.filePath) {
+                val percent = offset * 100 / total
                 Log.d("[Content] Download progress is: $offset / $total ($percent%)")
                 downloadProgress.postValue(percent)
+
+                if (offset == total) {
+                    chatMessage.removeListener(this)
+                }
             }
         }