diff --git a/modules/ChatQuotes/Model/Quote/Message.cs b/modules/ChatQuotes/Model/Quote/Message.cs
index 8b95162..df50f77 100644
--- a/modules/ChatQuotes/Model/Quote/Message.cs
+++ b/modules/ChatQuotes/Model/Quote/Message.cs
@@ -1,6 +1,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using File = Telegram.Bot.Types.File;
+using TgUser = Telegram.Bot.Types.User;
 
 namespace West.TelegramBot.ChatQuotes.Model.Quote;
 
@@ -37,9 +38,18 @@ public class Message
             quoteMessage.MediaType = Quote.MediaType.Sticker;
         }
 
+        TgUser? user = null;
+        if (msg.ForwardSenderName != null && msg.ForwardFrom == null)
+        {
+            user = new TgUser
+            {
+                FirstName = msg.ForwardSenderName
+            };
+        }
+
         quoteMessage.ChatId = msg.Chat.Id;
         quoteMessage.ReplyMessage = msg.ReplyToMessage;
-        quoteMessage.From = User.FromTgUser(msg.ForwardFrom ?? msg.From!);
+        quoteMessage.From = User.FromTgUser(user ?? msg.ForwardFrom ?? msg.From!);
 
         return quoteMessage;
     }