diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatView.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatView.kt
index 07e6fc543..1c1a16e17 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatView.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/chat/ChatView.kt
@@ -390,7 +390,7 @@ class ChatView(private val bundle: Bundle) : BaseView(), ImageLoaderInterface {
                 quotedChatText.maxLines = 2
                 quotedChatText.ellipsize = TextUtils.TruncateAt.END
                 quotedChatText.text = chatMessage.text
-                quotedAuthor.text = chatMessage.user.name
+                quotedAuthor.text = if (chatMessage.user.name.isNotEmpty()) chatMessage.user.name else resources.getText(R.string.nc_guest)
                 quotedMessageTime.text = DateFormatter.format(chatMessage.createdAt, DateFormatter.Template.TIME)
                 loadImage(quotedUserAvatar, chatMessage.user.avatar)