diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ChatView.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ChatView.kt
index acca38cc..1360ecb5 100644
--- a/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ChatView.kt
+++ b/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ChatView.kt
@@ -672,7 +672,7 @@ class ChatView : ConstraintLayout {
 
     private fun updateUserMessages(userId: String) {
         adapter.messages?.toList()?.let { messages ->
-            messages.filter { it.userId == userId }.forEach { message ->
+            messages.filter { it.userId != null && it.userId == userId }.forEach { message ->
                 messages.indexOf(message).takeIf { it != -1 }?.let {
                     adapter.notifyItemChanged(it)
                 }
diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/MessageClickedDialog.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/MessageClickedDialog.kt
index a0ace8d6..4a48e217 100644
--- a/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/MessageClickedDialog.kt
+++ b/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/MessageClickedDialog.kt
@@ -332,7 +332,7 @@ class MessageClickedDialog : BottomSheetDialogFragment(), IntegrityDialog.Callba
     fun updateUserMessages(userId: String) {
         adapter?.let { adapter ->
             adapter.messages?.toList()?.let { messages ->
-                messages.filter { it.userId == userId }.forEach { message ->
+                messages.filter { it.userId != null && it.userId == userId }.forEach { message ->
                     messages.indexOf(message).takeIf { it != -1 }?.let {
                         adapter.notifyItemChanged(it)
                     }
diff --git a/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ReplyClickedDialog.kt b/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ReplyClickedDialog.kt
index 9340c5b3..b7a85a9f 100644
--- a/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ReplyClickedDialog.kt
+++ b/app/src/main/java/com/github/andreyasadchy/xtra/ui/chat/ReplyClickedDialog.kt
@@ -168,7 +168,7 @@ class ReplyClickedDialog : BottomSheetDialogFragment() {
     fun updateUserMessages(userId: String) {
         adapter?.let { adapter ->
             adapter.messages?.toList()?.let { messages ->
-                messages.filter { it.userId == userId }.forEach { message ->
+                messages.filter { it.userId != null && it.userId == userId }.forEach { message ->
                     messages.indexOf(message).takeIf { it != -1 }?.let {
                         adapter.notifyItemChanged(it)
                     }