diff --git a/protocol/message_handler.go b/protocol/message_handler.go
index 353d9b47f..f1de98e9c 100644
--- a/protocol/message_handler.go
+++ b/protocol/message_handler.go
@@ -107,9 +107,8 @@ func (m *MessageHandler) HandleMembershipUpdate(messageState *ReceivedMessageSta
 	// Set in the map
 	messageState.ModifiedChats[chat.ID] = true
 
-	msg, ok := message.Message.(*protobuf.ChatMessage)
-	if msg != nil && ok {
-		messageState.CurrentMessageState.Message = *msg
+	if message.Message != nil {
+		messageState.CurrentMessageState.Message = *message.Message
 		return m.HandleChatMessage(messageState)
 	}