diff --git a/modules/ChatQuotes/Model/Quote/Message.cs b/modules/ChatQuotes/Model/Quote/Message.cs
index e494f5b..8b95162 100644
--- a/modules/ChatQuotes/Model/Quote/Message.cs
+++ b/modules/ChatQuotes/Model/Quote/Message.cs
@@ -39,7 +39,7 @@ public class Message
 
         quoteMessage.ChatId = msg.Chat.Id;
         quoteMessage.ReplyMessage = msg.ReplyToMessage;
-        quoteMessage.From = User.FromTgUser(msg.From!);
+        quoteMessage.From = User.FromTgUser(msg.ForwardFrom ?? msg.From!);
 
         return quoteMessage;
     }