diff --git a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
index 9a40d599d5..fe4c48e6b1 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt
@@ -1608,7 +1608,8 @@ class ChatViewModel @AssistedInject constructor(
                 isReactionsMessage(currentMessage) ||
                 isPollVotedMessage(currentMessage) ||
                 isEditMessage(currentMessage) ||
-                isThreadCreatedMessage(currentMessage)
+                isThreadCreatedMessage(currentMessage) ||
+                isUnpinnedMessage(currentMessage)
 
         val chatMessageMap = chatMessageList.associateBy { it.jsonMessageId }.toMutableMap()
         val chatMessageIterator = chatMessageMap.iterator()
@@ -1669,6 +1670,9 @@ class ChatViewModel @AssistedInject constructor(
     private fun isPollVotedMessage(currentMessage: MutableMap.MutableEntry<Int, ChatMessage>): Boolean =
         currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.POLL_VOTED
 
+    private fun isUnpinnedMessage(currentMessage: MutableMap.MutableEntry<Int, ChatMessage>): Boolean =
+        currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.MESSAGE_UNPINNED
+
     private fun handleThreadMessages(chatMessageList: List<ChatMessage>): List<ChatMessage> {
         fun isThreadChildMessage(currentMessage: MutableMap.MutableEntry<Int, ChatMessage>): Boolean =
             currentMessage.value.isThread &&